ICU-57166.0.1.tar.gz

[apple/icu.git] / icuSources / data / locales / root.txt
diff --git a/icuSources/data/locales/root.txt b/icuSources/data/locales/root.txt

index e477a4163e3d9b795542c318955d6af4f8ac9936..b86cba6585f7d18d85460fe77992f73db09af3a7 100644 (file)
--- a/icuSources/data/locales/root.txt
+++ b/icuSources/data/locales/root.txt
@@ -1,23 +1,27 @@
  // ***************************************************************************
  // *
  // ***************************************************************************
  // *
-// * Copyright (C) 2012 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/common/main/root.xml
+// * Copyright (C) 2016 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/root.xml
  // *
  // ***************************************************************************
  /**
  // *
  // ***************************************************************************
  /**
- *  ICU <specials> source: <path>/xml/main/root.xml
+ * ICU <specials> source: <path>/common/main/root.xml
   */
  root{
      AuxExemplarCharacters{"[]"}
   */
  root{
      AuxExemplarCharacters{"[]"}
-    ExemplarCharacters{"[]"}
-    ExemplarCharactersCurrency{"[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]"}
-    ExemplarCharactersPunctuation{"[\- , ; \: ! ? . ( ) \[ \] \{ \}]"}
-    LocaleScript{
-        "Zyyy",
+    Ellipsis{
+        final{"{0}…"}
+        initial{"…{0}"}
+        medial{"{0}…{1}"}
+        word-final{"{0} …"}
+        word-initial{"… {0}"}
+        word-medial{"{0} … {1}"}
      }
      }
-    MeasurementSystem:int{0}
+    ExemplarCharacters{"[]"}
+    ExemplarCharactersPunctuation{"[\\- , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"}
+    MoreInformation{"?"}
      NumberElements{
          arab{
              symbols{
      NumberElements{
          arab{
              symbols{
@@ -26,11 +30,13 @@ root{
                  group{"٬"}
                  infinity{"∞"}
                  list{"؛"}
                  group{"٬"}
                  infinity{"∞"}
                  list{"؛"}
-                minusSign{"-"}
+                minusSign{"‏-"}
                  nan{"NaN"}
                  perMille{"؉"}
                  nan{"NaN"}
                  perMille{"؉"}
-                percentSign{"٪"}
-                plusSign{"+"}
+                percentSign{"٪‏"}
+                plusSign{"‏+"}
+                superscriptingExponent{"×"}
+                timeSeparator{":"}
              }
          }
          arabext{
              }
          }
          arabext{
@@ -40,21 +46,106 @@ root{
                  group{"٬"}
                  infinity{"∞"}
                  list{"؛"}
                  group{"٬"}
                  infinity{"∞"}
                  list{"؛"}
-                minusSign{"-"}
+                minusSign{"‎-‎"}
                  nan{"NaN"}
                  perMille{"؉"}
                  percentSign{"٪"}
                  nan{"NaN"}
                  perMille{"؉"}
                  percentSign{"٪"}
-                plusSign{"+"}
+                plusSign{"‎+‎"}
+                superscriptingExponent{"×"}
+                timeSeparator{"٫"}
              }
          }
          default{"latn"}
          latn{
              }
          }
          default{"latn"}
          latn{
+            miscPatterns{
+                atLeast{"⩾{0}"}
+                range{"{0}–{1}"}
+            }
              patterns{
              patterns{
+                accountingFormat:alias{"/LOCALE/NumberElements/latn/patterns/currencyFormat"}
                  currencyFormat{"¤ #,##0.00"}
                  decimalFormat{"#,##0.###"}
                  percentFormat{"#,##0%"}
                  scientificFormat{"#E0"}
              }
                  currencyFormat{"¤ #,##0.00"}
                  decimalFormat{"#,##0.###"}
                  percentFormat{"#,##0%"}
                  scientificFormat{"#E0"}
              }
+            patternsShort{
+                currencyFormat{
+                    1000{
+                        other{"¤ 0K"}
+                    }
+                    10000{
+                        other{"¤ 00K"}
+                    }
+                    100000{
+                        other{"¤ 000K"}
+                    }
+                    1000000{
+                        other{"¤ 0M"}
+                    }
+                    10000000{
+                        other{"¤ 00M"}
+                    }
+                    100000000{
+                        other{"¤ 000M"}
+                    }
+                    1000000000{
+                        other{"¤ 0G"}
+                    }
+                    10000000000{
+                        other{"¤ 00G"}
+                    }
+                    100000000000{
+                        other{"¤ 000G"}
+                    }
+                    1000000000000{
+                        other{"¤ 0T"}
+                    }
+                    10000000000000{
+                        other{"¤ 00T"}
+                    }
+                    100000000000000{
+                        other{"¤ 000T"}
+                    }
+                }
+                decimalFormat{
+                    1000{
+                        other{"0K"}
+                    }
+                    10000{
+                        other{"00K"}
+                    }
+                    100000{
+                        other{"000K"}
+                    }
+                    1000000{
+                        other{"0M"}
+                    }
+                    10000000{
+                        other{"00M"}
+                    }
+                    100000000{
+                        other{"000M"}
+                    }
+                    1000000000{
+                        other{"0G"}
+                    }
+                    10000000000{
+                        other{"00G"}
+                    }
+                    100000000000{
+                        other{"000G"}
+                    }
+                    1000000000000{
+                        other{"0T"}
+                    }
+                    10000000000000{
+                        other{"00T"}
+                    }
+                    100000000000000{
+                        other{"000T"}
+                    }
+                }
+            }
              symbols{
                  decimal{"."}
                  exponential{"E"}
              symbols{
                  decimal{"."}
                  exponential{"E"}
@@ -66,73 +157,23 @@ root{
                  perMille{"‰"}
                  percentSign{"%"}
                  plusSign{"+"}
                  perMille{"‰"}
                  percentSign{"%"}
                  plusSign{"+"}
+                superscriptingExponent{"×"}
+                timeSeparator{":"}
              }
          }
              }
          }
+        minimumGroupingDigits{"1"}
          native{"latn"}
      }
          native{"latn"}
      }
-    PaperSize:intvector{
-        297,
-        210,
-    }
-    Version{"2.0.67.6"}
+    Version{"2.1.22.93"}
      calendar{
          buddhist{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
      calendar{
          buddhist{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, G y MMMM dd",
-                "G y MMMM d",
-                "G y MMM d",
-                "GGGGG yyyy-MM-dd",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-            }
-            appendItems{
-                Day{"{0} ({2}: {1})"}
-                Day-Of-Week{"{0} {1}"}
-                Era{"{0} {1}"}
-                Hour{"{0} ({2}: {1})"}
-                Minute{"{0} ({2}: {1})"}
-                Month{"{0} ({2}: {1})"}
-                Quarter{"{0} ({2}: {1})"}
-                Second{"{0} ({2}: {1})"}
-                Timezone{"{0} {1}"}
-                Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
-            }
-            availableFormats{
-                Ed{"d E"}
-                Gy{"G y"}
-                H{"HH"}
-                Hm{"HH:mm"}
-                Hms{"HH:mm:ss"}
-                M{"L"}
-                MEd{"E, M-d"}
-                MMM{"LLL"}
-                MMMEd{"E MMM d"}
-                MMMd{"MMM d"}
-                Md{"M-d"}
-                d{"d"}
-                h{"h a"}
-                hm{"h:mm a"}
-                hms{"h:mm:ss a"}
-                ms{"mm:ss"}
-                y{"G y"}
-                yM{"GGGGG yyyy-MM"}
-                yMEd{"E, GGGGG yyyy-MM-dd"}
-                yMMM{"G y MMM"}
-                yMMMEd{"E, G y MMM d"}
-                yMMMd{"G y MMM d"}
-                yMd{"GGGGG yyyy-MM-dd"}
-                yQ{"GGGGG yyyy Q"}
-                yQQQ{"G y QQQ"}
-            }
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
@@ -141,31 +182,34 @@ root{
                  narrow:alias{"/LOCALE/calendar/buddhist/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/buddhist/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/buddhist/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/buddhist/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
          chinese{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
              monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
          chinese{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
              DateTimePatterns{
                  "HH:mm:ss zzzz",
                  "HH:mm:ss z",
                  "HH:mm:ss",
                  "HH:mm",
              DateTimePatterns{
                  "HH:mm:ss zzzz",
                  "HH:mm:ss z",
                  "HH:mm:ss",
                  "HH:mm",
-                "EEEE, U MMMM dd",
-                "U MMMM d",
-                "U MMM d",
-                "y-M-d",
+                "r(U) MMMM d, EEEE",
+                "r(U) MMMM d",
+                "r MMM d",
+                "r-MM-dd",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
              }
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
              }
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
              appendItems{
                  Day{"{0} ({2}: {1})"}
                  Day-Of-Week{"{0} {1}"}
              appendItems{
                  Day{"{0} ({2}: {1})"}
                  Day-Of-Week{"{0} {1}"}
-                Era{"{0} {1}"}
+                Era{"{1} {0}"}
                  Hour{"{0} ({2}: {1})"}
                  Minute{"{0} ({2}: {1})"}
                  Month{"{0} ({2}: {1})"}
                  Hour{"{0} ({2}: {1})"}
                  Minute{"{0} ({2}: {1})"}
                  Month{"{0} ({2}: {1})"}
@@ -173,33 +217,46 @@ root{
                  Second{"{0} ({2}: {1})"}
                  Timezone{"{0} {1}"}
                  Week{"{0} ({2}: {1})"}
                  Second{"{0} ({2}: {1})"}
                  Timezone{"{0} {1}"}
                  Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
+                Year{"{1} {0}"}
              }
              availableFormats{
              }
              availableFormats{
-                Ed{"d E"}
+                E{"ccc"}
+                Ed{"d, E"}
+                Gy{"r U"}
+                GyMMM{"r(U) MMM"}
+                GyMMMEd{"r(U) MMM d, E"}
+                GyMMMd{"r MMM d"}
                  H{"HH"}
                  Hm{"HH:mm"}
                  Hms{"HH:mm:ss"}
                  M{"L"}
                  H{"HH"}
                  Hm{"HH:mm"}
                  Hms{"HH:mm:ss"}
                  M{"L"}
-                MEd{"E, M-d"}
+                MEd{"MM-dd, E"}
                  MMM{"LLL"}
                  MMM{"LLL"}
-                MMMEd{"E MMM d"}
+                MMMEd{"MMM d, E"}
+                MMMMd{"MMMM d"}
                  MMMd{"MMM d"}
                  MMMd{"MMM d"}
-                Md{"M-d"}
+                Md{"MM-dd"}
+                UM{"U MM"}
+                UMMM{"U MMM"}
+                UMMMd{"U MMM d"}
+                UMd{"U MM-d"}
                  d{"d"}
                  h{"h a"}
                  hm{"h:mm a"}
                  hms{"h:mm:ss a"}
                  ms{"mm:ss"}
                  d{"d"}
                  h{"h a"}
                  hm{"h:mm a"}
                  hms{"h:mm:ss a"}
                  ms{"mm:ss"}
-                y{"U"}
-                yM{"y-M"}
-                yMEd{"E, y-M-d"}
-                yMMM{"U MMM"}
-                yMMMEd{"E, U MMM d"}
-                yMMMd{"U MMM d"}
-                yMd{"y-M-d"}
-                yQ{"U Q"}
-                yQQQ{"U QQQ"}
+                y{"r(U)"}
+                yMd{"r-MM-dd"}
+                yyyy{"r(U)"}
+                yyyyM{"r-MM"}
+                yyyyMEd{"r-MM-dd, E"}
+                yyyyMMM{"r(U) MMM"}
+                yyyyMMMEd{"r(U) MMM d, E"}
+                yyyyMMMM{"r(U) MMMM"}
+                yyyyMMMd{"r MMM d"}
+                yyyyMd{"r-MM-dd"}
+                yyyyQQQ{"r(U) QQQ"}
+                yyyyQQQQ{"r(U) QQQQ"}
              }
              cyclicNameSets{
                  dayParts{
              }
              cyclicNameSets{
                  dayParts{
@@ -224,6 +281,44 @@ root{
                  }
                  days:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years"}
                  months:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years"}
                  }
                  days:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years"}
                  months:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years"}
+                solarTerms{
+                    format{
+                        abbreviated{
+                            "spring begins",
+                            "rain water",
+                            "insects awaken",
+                            "spring equinox",
+                            "bright and clear",
+                            "grain rain",
+                            "summer begins",
+                            "grain full",
+                            "grain in ear",
+                            "summer solstice",
+                            "minor heat",
+                            "major heat",
+                            "autumn begins",
+                            "end of heat",
+                            "white dew",
+                            "autumn equinox",
+                            "cold dew",
+                            "frost descends",
+                            "winter begins",
+                            "minor snow",
+                            "major snow",
+                            "winter solstice",
+                            "minor cold",
+                            "major cold",
+                        }
+                        narrow:alias{
+                            "/LOCALE/calendar/chinese/cyclicNameSets/solarTerms/format/abbreviate"
+                            "d"
+                        }
+                        wide:alias{
+                            "/LOCALE/calendar/chinese/cyclicNameSets/solarTerms/format/abbreviate"
+                            "d"
+                        }
+                    }
+                }
                  years{
                      format{
                          abbreviated{
                  years{
                      format{
                          abbreviated{
@@ -292,49 +387,51 @@ root{
                          wide:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years/format/abbreviated"}
                      }
                  }
                          wide:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years/format/abbreviated"}
                      }
                  }
-                zodiacs:alias{"/LOCALE/calendar/chinese/cyclicNameSets/dayParts"}
+                zodiacs{
+                    format{
+                        abbreviated:alias{"/LOCALE/calendar/chinese/cyclicNameSets/dayParts/format/abbreviated"}
+                        narrow:alias{"/LOCALE/calendar/chinese/cyclicNameSets/zodiacs/format/abbreviated"}
+                        wide:alias{"/LOCALE/calendar/chinese/cyclicNameSets/zodiacs/format/abbreviated"}
+                    }
+                }
              }
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              intervalFormats{
                  H{
                      H{"HH–HH"}
              }
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              intervalFormats{
                  H{
                      H{"HH–HH"}
-                    a{"HH–HH"}
                  }
                  Hm{
                      H{"HH:mm–HH:mm"}
                  }
                  Hm{
                      H{"HH:mm–HH:mm"}
-                    a{"HH:mm–HH:mm"}
                      m{"HH:mm–HH:mm"}
                  }
                  Hmv{
                      H{"HH:mm–HH:mm v"}
                      m{"HH:mm–HH:mm"}
                  }
                  Hmv{
                      H{"HH:mm–HH:mm v"}
-                    a{"HH:mm–HH:mm v"}
                      m{"HH:mm–HH:mm v"}
                  }
                  Hv{
                      H{"HH–HH v"}
                      m{"HH:mm–HH:mm v"}
                  }
                  Hv{
                      H{"HH–HH v"}
-                    a{"HH–HH v"}
                  }
                  M{
                  }
                  M{
-                    M{"M–M"}
+                    M{"MM–MM"}
                  }
                  MEd{
                  }
                  MEd{
-                    M{"E, MM-dd – E, MM-dd"}
-                    d{"E, MM-dd – E, MM-dd"}
+                    M{"MM-dd, E – MM-dd, E"}
+                    d{"MM-dd, E – MM-dd, E"}
                  }
                  MMM{
                      M{"LLL–LLL"}
                  }
                  MMMEd{
                  }
                  MMM{
                      M{"LLL–LLL"}
                  }
                  MMMEd{
-                    M{"E, MM-d – E, MM-d"}
-                    d{"E, MM-d – E, MM-d"}
+                    M{"MMM d, E – MMM d, E"}
+                    d{"MMM d, E – MMM d, E"}
                  }
                  MMMd{
                  }
                  MMMd{
-                    M{"MM-d – MM-d"}
-                    d{"MM-d – d"}
+                    M{"MMM d – MMM d"}
+                    d{"MMM d–d"}
                  }
                  Md{
                      M{"MM-dd – MM-dd"}
                  }
                  Md{
                      M{"MM-dd – MM-dd"}
-                    d{"MM-dd – dd"}
+                    d{"MM-dd – MM-dd"}
                  }
                  d{
                      d{"d–d"}
                  }
                  d{
                      d{"d–d"}
@@ -359,60 +456,58 @@ root{
                      h{"h–h a v"}
                  }
                  y{
                      h{"h–h a v"}
                  }
                  y{
-                    y{"y–y"}
+                    y{"U–U"}
                  }
                  yM{
                  }
                  yM{
-                    M{"y-MM – MM"}
+                    M{"y-MM – y-MM"}
                      y{"y-MM – y-MM"}
                  }
                  yMEd{
                      y{"y-MM – y-MM"}
                  }
                  yMEd{
-                    M{"E, y-MM-dd – E, y-MM-dd"}
-                    d{"E, y-MM-dd – E, y-MM-dd"}
-                    y{"E, y-MM-dd – E, y-MM-dd"}
+                    M{"y-MM-dd, E – y-MM-dd, E"}
+                    d{"y-MM-dd, E – y-MM-dd, E"}
+                    y{"y-MM-dd, E – y-MM-dd, E"}
                  }
                  yMMM{
                  }
                  yMMM{
-                    M{"U MMM – MMM"}
+                    M{"U MMM–MMM"}
                      y{"U MMM – U MMM"}
                  }
                  yMMMEd{
                      y{"U MMM – U MMM"}
                  }
                  yMMMEd{
-                    M{"E, U MMM-d – E, U MMM-d"}
-                    d{"E, U MMM-d – E, U MMM-d"}
-                    y{"E, U MMM-d – E, U MMM-d"}
+                    M{"U MMM d, E – MMM d, E"}
+                    d{"U MMM d, E – MMM d, E"}
+                    y{"U MMM d, E – U MMM d, E"}
                  }
                  yMMMM{
                  }
                  yMMMM{
-                    M{"U MMMM – MMMM"}
+                    M{"U MMMM–MMMM"}
                      y{"U MMMM – U MMMM"}
                  }
                  yMMMd{
                      y{"U MMMM – U MMMM"}
                  }
                  yMMMd{
-                    M{"U MMM-d – MMM-d"}
-                    d{"U MMM-d – d"}
-                    y{"U MMM-d – U MMM-d"}
+                    M{"U MMM d – MMM d"}
+                    d{"U MMM d–d"}
+                    y{"U MMM d – U MMM d"}
                  }
                  yMd{
                  }
                  yMd{
-                    M{"y-MM-dd – MM-dd"}
-                    d{"y-MM-dd – dd"}
+                    M{"y-MM-dd – y-MM-dd"}
+                    d{"y-MM-dd – y-MM-dd"}
                      y{"y-MM-dd – y-MM-dd"}
                  }
              }
              monthNames{
                      y{"y-MM-dd – y-MM-dd"}
                  }
              }
              monthNames{
-                default{"format"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/chinese/monthNames/format/wide"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/chinese/monthNames/format/wide"}
-                    default{"wide"}
                      narrow:alias{"/LOCALE/calendar/chinese/monthNames/stand-alone/narrow"}
                      wide{
                      narrow:alias{"/LOCALE/calendar/chinese/monthNames/stand-alone/narrow"}
                      wide{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                        "8",
-                        "9",
-                        "10",
-                        "11",
-                        "12",
+                        "M01",
+                        "M02",
+                        "M03",
+                        "M04",
+                        "M05",
+                        "M06",
+                        "M07",
+                        "M08",
+                        "M09",
+                        "M10",
+                        "M11",
+                        "M12",
                      }
                  }
                  stand-alone{
                      }
                  }
                  stand-alone{
@@ -459,9 +554,12 @@ root{
          }
          coptic{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
          }
          coptic{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
@@ -471,12 +569,10 @@ root{
                  narrow:alias{"/LOCALE/calendar/coptic/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/coptic/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/coptic/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/coptic/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames{
              monthNames{
-                default{"format"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/coptic/monthNames/format/wide"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/coptic/monthNames/format/wide"}
-                    default{"wide"}
                      narrow:alias{"/LOCALE/calendar/coptic/monthNames/stand-alone/narrow"}
                      wide{
                          "Tout",
                      narrow:alias{"/LOCALE/calendar/coptic/monthNames/stand-alone/narrow"}
                      wide{
                          "Tout",
@@ -516,12 +612,30 @@ root{
              }
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
              }
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
+        dangi{
+            AmPmMarkers:alias{"/LOCALE/calendar/chinese/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/chinese/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/chinese/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/chinese/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/chinese/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/chinese/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/chinese/availableFormats"}
+            cyclicNameSets:alias{"/LOCALE/calendar/chinese/cyclicNameSets"}
+            dayNames:alias{"/LOCALE/calendar/chinese/dayNames"}
+            intervalFormats:alias{"/LOCALE/calendar/chinese/intervalFormats"}
+            monthNames:alias{"/LOCALE/calendar/chinese/monthNames"}
+            monthPatterns:alias{"/LOCALE/calendar/chinese/monthPatterns"}
+            quarters:alias{"/LOCALE/calendar/chinese/quarters"}
+        }
          default{"gregorian"}
          ethiopic{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
          default{"gregorian"}
          ethiopic{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
@@ -531,12 +645,10 @@ root{
                  narrow:alias{"/LOCALE/calendar/ethiopic/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/ethiopic/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/ethiopic/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/ethiopic/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames{
              monthNames{
-                default{"format"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/ethiopic/monthNames/format/wide"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/ethiopic/monthNames/format/wide"}
-                    default{"wide"}
                      narrow:alias{"/LOCALE/calendar/ethiopic/monthNames/stand-alone/narrow"}
                      wide{
                          "Meskerem",
                      narrow:alias{"/LOCALE/calendar/ethiopic/monthNames/stand-alone/narrow"}
                      wide{
                          "Meskerem",
@@ -577,11 +689,14 @@ root{
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
          ethiopic-amete-alem{
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
          ethiopic-amete-alem{
-            AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
-            dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
+            AmPmMarkers:alias{"/LOCALE/calendar/ethiopic/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/ethiopic/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/ethiopic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/ethiopic/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/ethiopic/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/ethiopic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/ethiopic/availableFormats"}
+            dayNames:alias{"/LOCALE/calendar/ethiopic/dayNames"}
              eras{
                  abbreviated{
                      "ERA0",
              eras{
                  abbreviated{
                      "ERA0",
@@ -589,34 +704,34 @@ root{
                  narrow:alias{"/LOCALE/calendar/ethiopic-amete-alem/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/ethiopic-amete-alem/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/ethiopic-amete-alem/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/ethiopic-amete-alem/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/ethiopic/intervalFormats"}
              monthNames:alias{"/LOCALE/calendar/ethiopic/monthNames"}
              monthNames:alias{"/LOCALE/calendar/ethiopic/monthNames"}
-            quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
+            quarters:alias{"/LOCALE/calendar/ethiopic/quarters"}
          }
          }
-        gregorian{
-            AmPmMarkers{
-                "AM",
-                "PM",
-            }
+        generic{
+            AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
              DateTimePatterns{
                  "HH:mm:ss zzzz",
                  "HH:mm:ss z",
                  "HH:mm:ss",
                  "HH:mm",
              DateTimePatterns{
                  "HH:mm:ss zzzz",
                  "HH:mm:ss z",
                  "HH:mm:ss",
                  "HH:mm",
-                "EEEE, y MMMM dd",
-                "y MMMM d",
-                "y MMM d",
-                "yyyy-MM-dd",
+                "G y MMMM d, EEEE",
+                "G y MMMM d",
+                "G y MMM d",
+                "GGGGG y-MM-dd",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
              }
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
                  "{1} {0}",
              }
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
              appendItems{
                  Day{"{0} ({2}: {1})"}
                  Day-Of-Week{"{0} {1}"}
              appendItems{
                  Day{"{0} ({2}: {1})"}
                  Day-Of-Week{"{0} {1}"}
-                Era{"{0} {1}"}
+                Era{"{1} {0}"}
                  Hour{"{0} ({2}: {1})"}
                  Minute{"{0} ({2}: {1})"}
                  Month{"{0} ({2}: {1})"}
                  Hour{"{0} ({2}: {1})"}
                  Minute{"{0} ({2}: {1})"}
                  Month{"{0} ({2}: {1})"}
@@ -624,152 +739,91 @@ root{
                  Second{"{0} ({2}: {1})"}
                  Timezone{"{0} {1}"}
                  Week{"{0} ({2}: {1})"}
                  Second{"{0} ({2}: {1})"}
                  Timezone{"{0} {1}"}
                  Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
+                Year{"{1} {0}"}
              }
              availableFormats{
              }
              availableFormats{
-                Ed{"d E"}
+                E{"ccc"}
+                EHm{"E HH:mm"}
+                EHms{"E HH:mm:ss"}
+                Ed{"d, E"}
+                Ehm{"E h:mm a"}
+                Ehms{"E h:mm:ss a"}
+                Gy{"G y"}
+                GyMMM{"G y MMM"}
+                GyMMMEd{"G y MMM d, E"}
+                GyMMMd{"G y MMM d"}
                  H{"HH"}
                  Hm{"HH:mm"}
                  Hms{"HH:mm:ss"}
                  M{"L"}
                  H{"HH"}
                  Hm{"HH:mm"}
                  Hms{"HH:mm:ss"}
                  M{"L"}
-                MEd{"E, M-d"}
+                MEd{"MM-dd, E"}
                  MMM{"LLL"}
                  MMM{"LLL"}
-                MMMEd{"E MMM d"}
+                MMMEd{"MMM d, E"}
+                MMMMd{"MMMM d"}
                  MMMd{"MMM d"}
                  MMMd{"MMM d"}
-                Md{"M-d"}
+                Md{"MM-dd"}
                  d{"d"}
                  h{"h a"}
                  hm{"h:mm a"}
                  hms{"h:mm:ss a"}
                  ms{"mm:ss"}
                  d{"d"}
                  h{"h a"}
                  hm{"h:mm a"}
                  hms{"h:mm:ss a"}
                  ms{"mm:ss"}
-                y{"y"}
-                yM{"y-M"}
-                yMEd{"E, y-M-d"}
-                yMMM{"y MMM"}
-                yMMMEd{"E, y MMM d"}
-                yMMMd{"y MMM d"}
-                yMd{"y-M-d"}
-                yQ{"y Q"}
-                yQQQ{"y QQQ"}
-            }
-            dayNames{
-                default{"format"}
-                format{
-                    abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
-                    default{"wide"}
-                    narrow:alias{"/LOCALE/calendar/gregorian/dayNames/stand-alone/narrow"}
-                    wide{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                    }
-                }
-                stand-alone{
-                    abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
-                    narrow{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                    }
-                    wide:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
-                }
+                y{"G y"}
+                yyyy{"G y"}
+                yyyyM{"GGGGG y-MM"}
+                yyyyMEd{"GGGGG y-MM-dd, E"}
+                yyyyMMM{"G y MMM"}
+                yyyyMMMEd{"G y MMM d, E"}
+                yyyyMMMM{"G y MMMM"}
+                yyyyMMMd{"G y MMM d"}
+                yyyyMd{"GGGGG y-MM-dd"}
+                yyyyQQQ{"G y QQQ"}
+                yyyyQQQQ{"G y QQQQ"}
              }
              }
+            dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              eras{
                  abbreviated{
-                    "BCE",
-                    "CE",
-                }
-                narrow:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
-                wide:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
-            }
-            fields{
-                day{
-                    dn{"Day"}
-                    relative{
-                        "-1"{"Yesterday"}
-                        "0"{"Today"}
-                        "1"{"Tomorrow"}
-                    }
-                }
-                dayperiod{
-                    dn{"Dayperiod"}
-                }
-                era{
-                    dn{"Era"}
-                }
-                hour{
-                    dn{"Hour"}
-                }
-                minute{
-                    dn{"Minute"}
-                }
-                month{
-                    dn{"Month"}
-                }
-                second{
-                    dn{"Second"}
-                }
-                week{
-                    dn{"Week"}
-                }
-                weekday{
-                    dn{"Day of the Week"}
-                }
-                year{
-                    dn{"Year"}
-                }
-                zone{
-                    dn{"Zone"}
+                    "ERA0",
+                    "ERA1",
                  }
                  }
+                narrow:alias{"/LOCALE/calendar/generic/eras/abbreviated"}
+                wide:alias{"/LOCALE/calendar/generic/eras/abbreviated"}
              }
              intervalFormats{
                  H{
                      H{"HH–HH"}
              }
              intervalFormats{
                  H{
                      H{"HH–HH"}
-                    a{"HH–HH"}
                  }
                  Hm{
                      H{"HH:mm–HH:mm"}
                  }
                  Hm{
                      H{"HH:mm–HH:mm"}
-                    a{"HH:mm–HH:mm"}
                      m{"HH:mm–HH:mm"}
                  }
                  Hmv{
                      H{"HH:mm–HH:mm v"}
                      m{"HH:mm–HH:mm"}
                  }
                  Hmv{
                      H{"HH:mm–HH:mm v"}
-                    a{"HH:mm–HH:mm v"}
                      m{"HH:mm–HH:mm v"}
                  }
                  Hv{
                      H{"HH–HH v"}
                      m{"HH:mm–HH:mm v"}
                  }
                  Hv{
                      H{"HH–HH v"}
-                    a{"HH–HH v"}
                  }
                  M{
                  }
                  M{
-                    M{"M–M"}
+                    M{"MM–MM"}
                  }
                  MEd{
                  }
                  MEd{
-                    M{"E, MM-dd – E, MM-dd"}
-                    d{"E, MM-dd – E, MM-dd"}
+                    M{"MM-dd, E – MM-dd, E"}
+                    d{"MM-dd, E – MM-dd, E"}
                  }
                  MMM{
                      M{"LLL–LLL"}
                  }
                  MMMEd{
                  }
                  MMM{
                      M{"LLL–LLL"}
                  }
                  MMMEd{
-                    M{"E, MM-d – E, MM-d"}
-                    d{"E, MM-d – E, MM-d"}
+                    M{"MMM d, E – MMM d, E"}
+                    d{"MMM d, E – MMM d, E"}
                  }
                  MMMd{
                  }
                  MMMd{
-                    M{"MM-d – MM-d"}
-                    d{"MM-d – d"}
+                    M{"MMM d – MMM d"}
+                    d{"MMM d–d"}
                  }
                  Md{
                      M{"MM-dd – MM-dd"}
                  }
                  Md{
                      M{"MM-dd – MM-dd"}
-                    d{"MM-dd – dd"}
+                    d{"MM-dd – MM-dd"}
                  }
                  d{
                      d{"d–d"}
                  }
                  d{
                      d{"d–d"}
@@ -794,64 +848,62 @@ root{
                      h{"h–h a v"}
                  }
                  y{
                      h{"h–h a v"}
                  }
                  y{
-                    y{"y–y"}
+                    y{"G y–y"}
                  }
                  yM{
                  }
                  yM{
-                    M{"yyyy-MM – MM"}
-                    y{"yyyy-MM – yyyy-MM"}
+                    M{"GGGGG y-MM – y-MM"}
+                    y{"GGGGG y-MM – y-MM"}
                  }
                  yMEd{
                  }
                  yMEd{
-                    M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
-                    d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
-                    y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+                    M{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                    d{"GGGGG y-MM-dd, E – y-MM-dd, E"}
+                    y{"GGGGG y-MM-dd, E – y-MM-dd, E"}
                  }
                  yMMM{
                  }
                  yMMM{
-                    M{"yyyy-MM – MM"}
-                    y{"yyyy-MM – yyyy-MM"}
+                    M{"G y MMM–MMM"}
+                    y{"G y MMM – y MMM"}
                  }
                  yMMMEd{
                  }
                  yMMMEd{
-                    M{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
-                    d{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
-                    y{"E, yyyy-MM-dd – E, yyyy-MM-dd"}
+                    M{"G y MMM d, E – MMM d, E"}
+                    d{"G y MMM d, E – MMM d, E"}
+                    y{"G y MMM d, E – y MMM d, E"}
                  }
                  yMMMM{
                  }
                  yMMMM{
-                    M{"yyyy-MM – MM"}
-                    y{"yyyy-MM – yyyy-MM"}
+                    M{"G y MMMM–MMMM"}
+                    y{"G y MMMM – y MMMM"}
                  }
                  yMMMd{
                  }
                  yMMMd{
-                    M{"yyyy-MM-dd – MM-d"}
-                    d{"yyyy-MM-d – d"}
-                    y{"yyyy-MM-dd – yyyy-MM-dd"}
+                    M{"G y MMM d – MMM d"}
+                    d{"G y MMM d–d"}
+                    y{"G y MMM d – y MMM d"}
                  }
                  yMd{
                  }
                  yMd{
-                    M{"yyyy-MM-dd – MM-dd"}
-                    d{"yyyy-MM-dd – dd"}
-                    y{"yyyy-MM-dd – yyyy-MM-dd"}
+                    M{"GGGGG y-MM-dd – y-MM-dd"}
+                    d{"GGGGG y-MM-dd – y-MM-dd"}
+                    y{"GGGGG y-MM-dd – y-MM-dd"}
                  }
              }
              monthNames{
                  }
              }
              monthNames{
-                default{"format"}
                  format{
                  format{
-                    abbreviated:alias{"/LOCALE/calendar/gregorian/monthNames/format/wide"}
-                    default{"wide"}
-                    narrow:alias{"/LOCALE/calendar/gregorian/monthNames/stand-alone/narrow"}
+                    abbreviated:alias{"/LOCALE/calendar/generic/monthNames/format/wide"}
+                    narrow:alias{"/LOCALE/calendar/generic/monthNames/stand-alone/narrow"}
                      wide{
                      wide{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                        "8",
-                        "9",
-                        "10",
-                        "11",
-                        "12",
+                        "M01",
+                        "M02",
+                        "M03",
+                        "M04",
+                        "M05",
+                        "M06",
+                        "M07",
+                        "M08",
+                        "M09",
+                        "M10",
+                        "M11",
+                        "M12",
                      }
                  }
                  stand-alone{
                      }
                  }
                  stand-alone{
-                    abbreviated:alias{"/LOCALE/calendar/gregorian/monthNames/format/abbreviated"}
+                    abbreviated:alias{"/LOCALE/calendar/generic/monthNames/format/abbreviated"}
                      narrow{
                          "1",
                          "2",
                      narrow{
                          "1",
                          "2",
@@ -866,51 +918,241 @@ root{
                          "11",
                          "12",
                      }
                          "11",
                          "12",
                      }
-                    wide:alias{"/LOCALE/calendar/gregorian/monthNames/format/wide"}
+                    wide:alias{"/LOCALE/calendar/generic/monthNames/format/wide"}
                  }
              }
                  }
              }
-            quarters{
+            quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
+        }
+        gregorian{
+            AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkersAbbr"}
+            AmPmMarkersAbbr{
+                "AM",
+                "PM",
+            }
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersAbbr"}
+            DateTimePatterns{
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
+                "y MMMM d, EEEE",
+                "y MMMM d",
+                "y MMM d",
+                "y-MM-dd",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+            appendItems{
+                Day{"{0} ({2}: {1})"}
+                Day-Of-Week{"{0} {1}"}
+                Era{"{1} {0}"}
+                Hour{"{0} ({2}: {1})"}
+                Minute{"{0} ({2}: {1})"}
+                Month{"{0} ({2}: {1})"}
+                Quarter{"{0} ({2}: {1})"}
+                Second{"{0} ({2}: {1})"}
+                Timezone{"{0} {1}"}
+                Week{"{0} ({2}: {1})"}
+                Year{"{1} {0}"}
+            }
+            availableFormats{
+                E{"ccc"}
+                EHm{"E HH:mm"}
+                EHms{"E HH:mm:ss"}
+                Ed{"d, E"}
+                Ehm{"E h:mm a"}
+                Ehms{"E h:mm:ss a"}
+                Gy{"G y"}
+                GyMMM{"G y MMM"}
+                GyMMMEd{"G y MMM d, E"}
+                GyMMMd{"G y MMM d"}
+                H{"HH"}
+                Hm{"HH:mm"}
+                Hms{"HH:mm:ss"}
+                Hmsv{"HH:mm:ss v"}
+                Hmv{"HH:mm v"}
+                M{"L"}
+                MEd{"MM-dd, E"}
+                MMM{"LLL"}
+                MMMEd{"MMM d, E"}
+                MMMMd{"MMMM d"}
+                MMMd{"MMM d"}
+                Md{"MM-dd"}
+                d{"d"}
+                h{"h a"}
+                hm{"h:mm a"}
+                hms{"h:mm:ss a"}
+                hmsv{"h:mm:ss a v"}
+                hmv{"h:mm a v"}
+                ms{"mm:ss"}
+                y{"y"}
+                yM{"y-MM"}
+                yMEd{"y-MM-dd, E"}
+                yMMM{"y MMM"}
+                yMMMEd{"y MMM d, E"}
+                yMMMM{"y MMMM"}
+                yMMMd{"y MMM d"}
+                yMd{"y-MM-dd"}
+                yQQQ{"y QQQ"}
+                yQQQQ{"y QQQQ"}
+            }
+            dayNames{
                  format{
                  format{
-                    abbreviated:alias{"/LOCALE/calendar/gregorian/quarters/format/wide"}
-                    narrow:alias{"/LOCALE/calendar/gregorian/quarters/stand-alone/narrow"}
+                    abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
+                    narrow:alias{"/LOCALE/calendar/gregorian/dayNames/stand-alone/narrow"}
+                    short:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
                      wide{
                      wide{
-                        "Q1",
-                        "Q2",
-                        "Q3",
-                        "Q4",
+                        "Sun",
+                        "Mon",
+                        "Tue",
+                        "Wed",
+                        "Thu",
+                        "Fri",
+                        "Sat",
                      }
                  }
                  stand-alone{
                      }
                  }
                  stand-alone{
-                    abbreviated:alias{"/LOCALE/calendar/gregorian/quarters/format/abbreviated"}
+                    abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
                      narrow{
                      narrow{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
+                        "S",
+                        "M",
+                        "T",
+                        "W",
+                        "T",
+                        "F",
+                        "S",
                      }
                      }
-                    wide:alias{"/LOCALE/calendar/gregorian/quarters/format/wide"}
+                    short:alias{"/LOCALE/calendar/gregorian/dayNames/format/short"}
+                    wide:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
                  }
              }
                  }
              }
-        }
-        hebrew{
-            AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
-            dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              eras{
                  abbreviated{
-                    "AM",
+                    "BCE",
+                    "CE",
+                }
+                narrow:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
+                wide:alias{"/LOCALE/calendar/gregorian/eras/abbreviated"}
+            }
+            intervalFormats{
+                H{
+                    H{"HH–HH"}
+                }
+                Hm{
+                    H{"HH:mm–HH:mm"}
+                    m{"HH:mm–HH:mm"}
+                }
+                Hmv{
+                    H{"HH:mm–HH:mm v"}
+                    m{"HH:mm–HH:mm v"}
+                }
+                Hv{
+                    H{"HH–HH v"}
+                }
+                M{
+                    M{"MM–MM"}
+                }
+                MEd{
+                    M{"MM-dd, E – MM-dd, E"}
+                    d{"MM-dd, E – MM-dd, E"}
+                }
+                MMM{
+                    M{"LLL–LLL"}
+                }
+                MMMEd{
+                    M{"MMM d, E – MMM d, E"}
+                    d{"MMM d, E – MMM d, E"}
+                }
+                MMMd{
+                    M{"MMM d – MMM d"}
+                    d{"MMM d–d"}
+                }
+                Md{
+                    M{"MM-dd – MM-dd"}
+                    d{"MM-dd – MM-dd"}
+                }
+                d{
+                    d{"d–d"}
+                }
+                fallback{"{0} – {1}"}
+                h{
+                    a{"h a – h a"}
+                    h{"h–h a"}
+                }
+                hm{
+                    a{"h:mm a – h:mm a"}
+                    h{"h:mm–h:mm a"}
+                    m{"h:mm–h:mm a"}
+                }
+                hmv{
+                    a{"h:mm a – h:mm a v"}
+                    h{"h:mm–h:mm a v"}
+                    m{"h:mm–h:mm a v"}
+                }
+                hv{
+                    a{"h a – h a v"}
+                    h{"h–h a v"}
+                }
+                y{
+                    y{"y–y"}
+                }
+                yM{
+                    M{"y-MM – y-MM"}
+                    y{"y-MM – y-MM"}
+                }
+                yMEd{
+                    M{"y-MM-dd, E – y-MM-dd, E"}
+                    d{"y-MM-dd, E – y-MM-dd, E"}
+                    y{"y-MM-dd, E – y-MM-dd, E"}
+                }
+                yMMM{
+                    M{"y MMM–MMM"}
+                    y{"y MMM – y MMM"}
+                }
+                yMMMEd{
+                    M{"y MMM d, E – MMM d, E"}
+                    d{"y MMM d, E – MMM d, E"}
+                    y{"y MMM d, E – y MMM d, E"}
+                }
+                yMMMM{
+                    M{"y MMMM–MMMM"}
+                    y{"y MMMM – y MMMM"}
+                }
+                yMMMd{
+                    M{"y MMM d – MMM d"}
+                    d{"y MMM d–d"}
+                    y{"y MMM d – y MMM d"}
+                }
+                yMd{
+                    M{"y-MM-dd – y-MM-dd"}
+                    d{"y-MM-dd – y-MM-dd"}
+                    y{"y-MM-dd – y-MM-dd"}
                  }
                  }
-                narrow:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
-                wide:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
              }
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
              monthNames{
              monthNames{
-                default{"format"}
                  format{
                  format{
-                    abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
-                    default{"wide"}
+                    abbreviated:alias{"/LOCALE/calendar/gregorian/monthNames/format/wide"}
+                    narrow:alias{"/LOCALE/calendar/gregorian/monthNames/stand-alone/narrow"}
+                    wide{
+                        "M01",
+                        "M02",
+                        "M03",
+                        "M04",
+                        "M05",
+                        "M06",
+                        "M07",
+                        "M08",
+                        "M09",
+                        "M10",
+                        "M11",
+                        "M12",
+                    }
+                }
+                stand-alone{
+                    abbreviated:alias{"/LOCALE/calendar/gregorian/monthNames/format/abbreviated"}
                      narrow{
                          "1",
                          "2",
                      narrow{
                          "1",
                          "2",
@@ -924,8 +1166,54 @@ root{
                          "10",
                          "11",
                          "12",
                          "10",
                          "11",
                          "12",
-                        "13",
                      }
                      }
+                    wide:alias{"/LOCALE/calendar/gregorian/monthNames/format/wide"}
+                }
+            }
+            quarters{
+                format{
+                    abbreviated:alias{"/LOCALE/calendar/gregorian/quarters/format/wide"}
+                    narrow:alias{"/LOCALE/calendar/gregorian/quarters/stand-alone/narrow"}
+                    wide{
+                        "Q1",
+                        "Q2",
+                        "Q3",
+                        "Q4",
+                    }
+                }
+                stand-alone{
+                    abbreviated:alias{"/LOCALE/calendar/gregorian/quarters/format/abbreviated"}
+                    narrow{
+                        "1",
+                        "2",
+                        "3",
+                        "4",
+                    }
+                    wide:alias{"/LOCALE/calendar/gregorian/quarters/format/wide"}
+                }
+            }
+        }
+        hebrew{
+            AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
+            dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
+            eras{
+                abbreviated{
+                    "AM",
+                }
+                narrow:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
+                wide:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
+            }
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
+            monthNames{
+                format{
+                    abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
+                    narrow:alias{"/LOCALE/calendar/hebrew/monthNames/stand-alone/narrow"}
                      wide{
                          "Tishri",
                          "Heshvan",
                      wide{
                          "Tishri",
                          "Heshvan",
@@ -945,7 +1233,22 @@ root{
                  }
                  stand-alone{
                      abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/abbreviated"}
                  }
                  stand-alone{
                      abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/abbreviated"}
-                    narrow:alias{"/LOCALE/calendar/hebrew/monthNames/format/narrow"}
+                    narrow{
+                        "1",
+                        "2",
+                        "3",
+                        "4",
+                        "5",
+                        "6",
+                        "7",
+                        "8",
+                        "9",
+                        "10",
+                        "11",
+                        "12",
+                        "13",
+                        "7",
+                    }
                      wide:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
                  }
              }
                      wide:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
                  }
              }
@@ -953,23 +1256,24 @@ root{
          }
          indian{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
          }
          indian{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
-                    "SAKA",
+                    "Saka",
                  }
                  narrow:alias{"/LOCALE/calendar/indian/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/indian/eras/abbreviated"}
              }
                  }
                  narrow:alias{"/LOCALE/calendar/indian/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/indian/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames{
              monthNames{
-                default{"format"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/indian/monthNames/format/wide"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/indian/monthNames/format/wide"}
-                    default{"wide"}
                      narrow:alias{"/LOCALE/calendar/indian/monthNames/stand-alone/narrow"}
                      wide{
                          "Chaitra",
                      narrow:alias{"/LOCALE/calendar/indian/monthNames/stand-alone/narrow"}
                      wide{
                          "Chaitra",
@@ -1009,9 +1313,12 @@ root{
          }
          islamic{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
          }
          islamic{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
@@ -1020,9 +1327,8 @@ root{
                  narrow:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames{
              monthNames{
-                default{"format"}
                  format{
                      abbreviated{
                          "Muh.",
                  format{
                      abbreviated{
                          "Muh.",
@@ -1038,7 +1344,6 @@ root{
                          "Dhuʻl-Q.",
                          "Dhuʻl-H.",
                      }
                          "Dhuʻl-Q.",
                          "Dhuʻl-H.",
                      }
-                    default{"wide"}
                      narrow:alias{"/LOCALE/calendar/islamic/monthNames/stand-alone/narrow"}
                      wide{
                          "Muharram",
                      narrow:alias{"/LOCALE/calendar/islamic/monthNames/stand-alone/narrow"}
                      wide{
                          "Muharram",
@@ -1078,7 +1383,52 @@ root{
          }
          islamic-civil{
              AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"}
          }
          islamic-civil{
              AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
+            dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
+            eras:alias{"/LOCALE/calendar/islamic/eras"}
+            intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
+            monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
+            quarters:alias{"/LOCALE/calendar/islamic/quarters"}
+        }
+        islamic-rgsa{
+            AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"}
              DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"}
              DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
+            dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
+            eras:alias{"/LOCALE/calendar/islamic/eras"}
+            intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
+            monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
+            quarters:alias{"/LOCALE/calendar/islamic/quarters"}
+        }
+        islamic-tbla{
+            AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
+            dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
+            eras:alias{"/LOCALE/calendar/islamic/eras"}
+            intervalFormats:alias{"/LOCALE/calendar/islamic/intervalFormats"}
+            monthNames:alias{"/LOCALE/calendar/islamic/monthNames"}
+            quarters:alias{"/LOCALE/calendar/islamic/quarters"}
+        }
+        islamic-umalqura{
+            AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"}
              appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
              availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
              appendItems:alias{"/LOCALE/calendar/islamic/appendItems"}
              availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/islamic/dayNames"}
@@ -1089,535 +1439,485 @@ root{
          }
          japanese{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
          }
          japanese{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, G y MMMM dd",
-                "G y MMMM d",
-                "G y MMM d",
-                "GGGGG yy-MM-dd",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-            }
-            appendItems{
-                Day{"{0} ({2}: {1})"}
-                Day-Of-Week{"{0} {1}"}
-                Era{"{0} {1}"}
-                Hour{"{0} ({2}: {1})"}
-                Minute{"{0} ({2}: {1})"}
-                Month{"{0} ({2}: {1})"}
-                Quarter{"{0} ({2}: {1})"}
-                Second{"{0} ({2}: {1})"}
-                Timezone{"{0} {1}"}
-                Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
-            }
-            availableFormats{
-                Ed{"d E"}
-                Gy{"G y"}
-                H{"HH"}
-                Hm{"HH:mm"}
-                Hms{"HH:mm:ss"}
-                M{"L"}
-                MEd{"E, M-d"}
-                MMM{"LLL"}
-                MMMEd{"E MMM d"}
-                MMMd{"MMM d"}
-                Md{"M-d"}
-                d{"d"}
-                h{"h a"}
-                hm{"h:mm a"}
-                hms{"h:mm:ss a"}
-                ms{"mm:ss"}
-                y{"G y"}
-                yyyy{"G y"}
-                yyyyM{"GGGGG yy-MM"}
-                yyyyMEd{"E, GGGGG yy-MM-dd"}
-                yyyyMMM{"G y MMM"}
-                yyyyMMMEd{"E, G y MMM d"}
-                yyyyMMMd{"G y MMM d"}
-                yyyyMd{"GGGGG yy-MM-dd"}
-                yyyyQ{"GGGGG yy Q"}
-                yyyyQQQ{"G y QQQ"}
-            }
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
-                    "Taika (645-650)",
-                    "Hakuchi (650-671)",
-                    "Hakuhō (672-686)",
-                    "Shuchō (686-701)",
-                    "Taihō (701-704)",
-                    "Keiun (704-708)",
-                    "Wadō (708-715)",
-                    "Reiki (715-717)",
-                    "Yōrō (717-724)",
-                    "Jinki (724-729)",
-                    "Tempyō (729-749)",
-                    "Tempyō-kampō (749-749)",
-                    "Tempyō-shōhō (749-757)",
-                    "Tempyō-hōji (757-765)",
-                    "Temphō-jingo (765-767)",
+                    "Taika (645–650)",
+                    "Hakuchi (650–671)",
+                    "Hakuhō (672–686)",
+                    "Shuchō (686–701)",
+                    "Taihō (701–704)",
+                    "Keiun (704–708)",
+                    "Wadō (708–715)",
+                    "Reiki (715–717)",
+                    "Yōrō (717–724)",
+                    "Jinki (724–729)",
+                    "Tenpyō (729–749)",
+                    "Tenpyō-kampō (749-749)",
+                    "Tenpyō-shōhō (749-757)",
+                    "Tenpyō-hōji (757-765)",
+                    "Tenpyō-jingo (765-767)",
                      "Jingo-keiun (767-770)",
                      "Jingo-keiun (767-770)",
-                    "Hōki (770-780)",
+                    "Hōki (770–780)",
                      "Ten-ō (781-782)",
                      "Ten-ō (781-782)",
-                    "Enryaku (782-806)",
-                    "Daidō (806-810)",
-                    "Kōnin (810-824)",
-                    "Tenchō (824-834)",
-                    "Shōwa (834-848)",
-                    "Kajō (848-851)",
-                    "Ninju (851-854)",
-                    "Saiko (854-857)",
-                    "Tennan (857-859)",
-                    "Jōgan (859-877)",
-                    "Genkei (877-885)",
-                    "Ninna (885-889)",
-                    "Kampyō (889-898)",
-                    "Shōtai (898-901)",
-                    "Engi (901-923)",
-                    "Enchō (923-931)",
-                    "Shōhei (931-938)",
-                    "Tengyō (938-947)",
-                    "Tenryaku (947-957)",
-                    "Tentoku (957-961)",
-                    "Ōwa (961-964)",
-                    "Kōhō (964-968)",
-                    "Anna (968-970)",
-                    "Tenroku (970-973)",
-                    "Ten-en (973-976)",
-                    "Jōgen (976-978)",
-                    "Tengen (978-983)",
-                    "Eikan (983-985)",
-                    "Kanna (985-987)",
-                    "Ei-en (987-989)",
-                    "Eiso (989-990)",
-                    "Shōryaku (990-995)",
-                    "Chōtoku (995-999)",
-                    "Chōhō (999-1004)",
-                    "Kankō (1004-1012)",
-                    "Chōwa (1012-1017)",
-                    "Kannin (1017-1021)",
-                    "Jian (1021-1024)",
-                    "Manju (1024-1028)",
-                    "Chōgen (1028-1037)",
-                    "Chōryaku (1037-1040)",
-                    "Chōkyū (1040-1044)",
-                    "Kantoku (1044-1046)",
-                    "Eishō (1046-1053)",
-                    "Tengi (1053-1058)",
-                    "Kōhei (1058-1065)",
-                    "Jiryaku (1065-1069)",
-                    "Enkyū (1069-1074)",
-                    "Shōho (1074-1077)",
-                    "Shōryaku (1077-1081)",
-                    "Eiho (1081-1084)",
-                    "Ōtoku (1084-1087)",
-                    "Kanji (1087-1094)",
-                    "Kaho (1094-1096)",
-                    "Eichō (1096-1097)",
-                    "Shōtoku (1097-1099)",
-                    "Kōwa (1099-1104)",
-                    "Chōji (1104-1106)",
-                    "Kashō (1106-1108)",
-                    "Tennin (1108-1110)",
+                    "Enryaku (782–806)",
+                    "Daidō (806–810)",
+                    "Kōnin (810–824)",
+                    "Tenchō (824–834)",
+                    "Jōwa (834–848)",
+                    "Kajō (848–851)",
+                    "Ninju (851–854)",
+                    "Saikō (854–857)",
+                    "Ten-an (857-859)",
+                    "Jōgan (859–877)",
+                    "Gangyō (877–885)",
+                    "Ninna (885–889)",
+                    "Kanpyō (889–898)",
+                    "Shōtai (898–901)",
+                    "Engi (901–923)",
+                    "Enchō (923–931)",
+                    "Jōhei (931–938)",
+                    "Tengyō (938–947)",
+                    "Tenryaku (947–957)",
+                    "Tentoku (957–961)",
+                    "Ōwa (961–964)",
+                    "Kōhō (964–968)",
+                    "Anna (968–970)",
+                    "Tenroku (970–973)",
+                    "Ten’en (973–976)",
+                    "Jōgen (976–978)",
+                    "Tengen (978–983)",
+                    "Eikan (983–985)",
+                    "Kanna (985–987)",
+                    "Eien (987–989)",
+                    "Eiso (989–990)",
+                    "Shōryaku (990–995)",
+                    "Chōtoku (995–999)",
+                    "Chōhō (999–1004)",
+                    "Kankō (1004–1012)",
+                    "Chōwa (1012–1017)",
+                    "Kannin (1017–1021)",
+                    "Jian (1021–1024)",
+                    "Manju (1024–1028)",
+                    "Chōgen (1028–1037)",
+                    "Chōryaku (1037–1040)",
+                    "Chōkyū (1040–1044)",
+                    "Kantoku (1044–1046)",
+                    "Eishō (1046–1053)",
+                    "Tengi (1053–1058)",
+                    "Kōhei (1058–1065)",
+                    "Jiryaku (1065–1069)",
+                    "Enkyū (1069–1074)",
+                    "Shōho (1074–1077)",
+                    "Shōryaku (1077–1081)",
+                    "Eihō (1081–1084)",
+                    "Ōtoku (1084–1087)",
+                    "Kanji (1087–1094)",
+                    "Kahō (1094–1096)",
+                    "Eichō (1096–1097)",
+                    "Jōtoku (1097–1099)",
+                    "Kōwa (1099–1104)",
+                    "Chōji (1104–1106)",
+                    "Kashō (1106–1108)",
+                    "Tennin (1108–1110)",
                      "Ten-ei (1110-1113)",
                      "Ten-ei (1110-1113)",
-                    "Eikyū (1113-1118)",
-                    "Gen-ei (1118-1120)",
-                    "Hoan (1120-1124)",
-                    "Tenji (1124-1126)",
-                    "Daiji (1126-1131)",
-                    "Tenshō (1131-1132)",
-                    "Chōshō (1132-1135)",
-                    "Hoen (1135-1141)",
-                    "Eiji (1141-1142)",
-                    "Kōji (1142-1144)",
-                    "Tenyō (1144-1145)",
-                    "Kyūan (1145-1151)",
-                    "Ninpei (1151-1154)",
-                    "Kyūju (1154-1156)",
-                    "Hogen (1156-1159)",
-                    "Heiji (1159-1160)",
-                    "Eiryaku (1160-1161)",
-                    "Ōho (1161-1163)",
-                    "Chōkan (1163-1165)",
-                    "Eiman (1165-1166)",
-                    "Nin-an (1166-1169)",
-                    "Kaō (1169-1171)",
-                    "Shōan (1171-1175)",
-                    "Angen (1175-1177)",
-                    "Jishō (1177-1181)",
-                    "Yōwa (1181-1182)",
-                    "Juei (1182-1184)",
-                    "Genryuku (1184-1185)",
-                    "Bunji (1185-1190)",
-                    "Kenkyū (1190-1199)",
-                    "Shōji (1199-1201)",
-                    "Kennin (1201-1204)",
-                    "Genkyū (1204-1206)",
-                    "Ken-ei (1206-1207)",
-                    "Shōgen (1207-1211)",
-                    "Kenryaku (1211-1213)",
-                    "Kenpō (1213-1219)",
-                    "Shōkyū (1219-1222)",
-                    "Jōō (1222-1224)",
-                    "Gennin (1224-1225)",
-                    "Karoku (1225-1227)",
-                    "Antei (1227-1229)",
-                    "Kanki (1229-1232)",
-                    "Jōei (1232-1233)",
-                    "Tempuku (1233-1234)",
-                    "Bunryaku (1234-1235)",
-                    "Katei (1235-1238)",
-                    "Ryakunin (1238-1239)",
-                    "En-ō (1239-1240)",
-                    "Ninji (1240-1243)",
-                    "Kangen (1243-1247)",
-                    "Hōji (1247-1249)",
-                    "Kenchō (1249-1256)",
-                    "Kōgen (1256-1257)",
-                    "Shōka (1257-1259)",
-                    "Shōgen (1259-1260)",
-                    "Bun-ō (1260-1261)",
-                    "Kōchō (1261-1264)",
-                    "Bun-ei (1264-1275)",
-                    "Kenji (1275-1278)",
-                    "Kōan (1278-1288)",
-                    "Shōō (1288-1293)",
-                    "Einin (1293-1299)",
-                    "Shōan (1299-1302)",
-                    "Kengen (1302-1303)",
-                    "Kagen (1303-1306)",
-                    "Tokuji (1306-1308)",
-                    "Enkei (1308-1311)",
-                    "Ōchō (1311-1312)",
-                    "Shōwa (1312-1317)",
-                    "Bunpō (1317-1319)",
-                    "Genō (1319-1321)",
-                    "Genkyō (1321-1324)",
-                    "Shōchū (1324-1326)",
-                    "Kareki (1326-1329)",
-                    "Gentoku (1329-1331)",
-                    "Genkō (1331-1334)",
-                    "Kemmu (1334-1336)",
-                    "Engen (1336-1340)",
-                    "Kōkoku (1340-1346)",
-                    "Shōhei (1346-1370)",
-                    "Kentoku (1370-1372)",
-                    "BunchÅ© (1372-1375)",
-                    "Tenju (1375-1379)",
-                    "Kōryaku (1379-1381)",
-                    "Kōwa (1381-1384)",
-                    "GenchÅ© (1384-1392)",
-                    "Meitoku (1384-1387)",
-                    "Kakei (1387-1389)",
-                    "Kōō (1389-1390)",
-                    "Meitoku (1390-1394)",
-                    "Ōei (1394-1428)",
-                    "Shōchō (1428-1429)",
-                    "Eikyō (1429-1441)",
-                    "Kakitsu (1441-1444)",
-                    "Bun-an (1444-1449)",
-                    "Hōtoku (1449-1452)",
-                    "Kyōtoku (1452-1455)",
-                    "Kōshō (1455-1457)",
-                    "Chōroku (1457-1460)",
-                    "Kanshō (1460-1466)",
-                    "Bunshō (1466-1467)",
-                    "Ōnin (1467-1469)",
-                    "Bunmei (1469-1487)",
-                    "Chōkyō (1487-1489)",
-                    "Entoku (1489-1492)",
-                    "Meiō (1492-1501)",
-                    "Bunki (1501-1504)",
-                    "Eishō (1504-1521)",
-                    "Taiei (1521-1528)",
-                    "Kyōroku (1528-1532)",
-                    "Tenmon (1532-1555)",
-                    "Kōji (1555-1558)",
-                    "Eiroku (1558-1570)",
-                    "Genki (1570-1573)",
-                    "Tenshō (1573-1592)",
-                    "Bunroku (1592-1596)",
-                    "Keichō (1596-1615)",
-                    "Genwa (1615-1624)",
-                    "Kan-ei (1624-1644)",
-                    "Shōho (1644-1648)",
-                    "Keian (1648-1652)",
-                    "Shōō (1652-1655)",
-                    "Meiryaku (1655-1658)",
-                    "Manji (1658-1661)",
-                    "Kanbun (1661-1673)",
-                    "Enpō (1673-1681)",
-                    "Tenwa (1681-1684)",
-                    "Jōkyō (1684-1688)",
-                    "Genroku (1688-1704)",
-                    "Hōei (1704-1711)",
-                    "Shōtoku (1711-1716)",
-                    "Kyōhō (1716-1736)",
-                    "Genbun (1736-1741)",
-                    "Kanpō (1741-1744)",
-                    "Enkyō (1744-1748)",
-                    "Kan-en (1748-1751)",
-                    "Hōryaku (1751-1764)",
-                    "Meiwa (1764-1772)",
-                    "An-ei (1772-1781)",
-                    "Tenmei (1781-1789)",
-                    "Kansei (1789-1801)",
-                    "Kyōwa (1801-1804)",
-                    "Bunka (1804-1818)",
-                    "Bunsei (1818-1830)",
-                    "Tenpō (1830-1844)",
-                    "Kōka (1844-1848)",
-                    "Kaei (1848-1854)",
-                    "Ansei (1854-1860)",
-                    "Man-en (1860-1861)",
-                    "Bunkyū (1861-1864)",
-                    "Genji (1864-1865)",
-                    "Keiō (1865-1868)",
+                    "Eikyū (1113–1118)",
+                    "Gen’ei (1118–1120)",
+                    "Hōan (1120–1124)",
+                    "Tenji (1124–1126)",
+                    "Daiji (1126–1131)",
+                    "Tenshō (1131–1132)",
+                    "Chōshō (1132–1135)",
+                    "Hōen (1135–1141)",
+                    "Eiji (1141–1142)",
+                    "Kōji (1142–1144)",
+                    "Ten’yō (1144–1145)",
+                    "Kyūan (1145–1151)",
+                    "Ninpei (1151–1154)",
+                    "Kyūju (1154–1156)",
+                    "Hōgen (1156–1159)",
+                    "Heiji (1159–1160)",
+                    "Eiryaku (1160–1161)",
+                    "Ōho (1161–1163)",
+                    "Chōkan (1163–1165)",
+                    "Eiman (1165–1166)",
+                    "Nin’an (1166–1169)",
+                    "Kaō (1169–1171)",
+                    "Shōan (1171–1175)",
+                    "Angen (1175–1177)",
+                    "Jishō (1177–1181)",
+                    "Yōwa (1181–1182)",
+                    "Juei (1182–1184)",
+                    "Genryaku (1184–1185)",
+                    "Bunji (1185–1190)",
+                    "Kenkyū (1190–1199)",
+                    "Shōji (1199–1201)",
+                    "Kennin (1201–1204)",
+                    "Genkyū (1204–1206)",
+                    "Ken’ei (1206–1207)",
+                    "Jōgen (1207–1211)",
+                    "Kenryaku (1211–1213)",
+                    "Kenpō (1213–1219)",
+                    "Jōkyū (1219–1222)",
+                    "Jōō (1222–1224)",
+                    "Gennin (1224–1225)",
+                    "Karoku (1225–1227)",
+                    "Antei (1227–1229)",
+                    "Kanki (1229–1232)",
+                    "Jōei (1232–1233)",
+                    "Tenpuku (1233–1234)",
+                    "Bunryaku (1234–1235)",
+                    "Katei (1235–1238)",
+                    "Ryakunin (1238–1239)",
+                    "En’ō (1239–1240)",
+                    "Ninji (1240–1243)",
+                    "Kangen (1243–1247)",
+                    "Hōji (1247–1249)",
+                    "Kenchō (1249–1256)",
+                    "Kōgen (1256–1257)",
+                    "Shōka (1257–1259)",
+                    "Shōgen (1259–1260)",
+                    "Bun’ō (1260–1261)",
+                    "Kōchō (1261–1264)",
+                    "Bun’ei (1264–1275)",
+                    "Kenji (1275–1278)",
+                    "Kōan (1278–1288)",
+                    "Shōō (1288–1293)",
+                    "Einin (1293–1299)",
+                    "Shōan (1299–1302)",
+                    "Kengen (1302–1303)",
+                    "Kagen (1303–1306)",
+                    "Tokuji (1306–1308)",
+                    "Enkyō (1308–1311)",
+                    "Ōchō (1311–1312)",
+                    "Shōwa (1312–1317)",
+                    "Bunpō (1317–1319)",
+                    "Genō (1319–1321)",
+                    "Genkō (1321–1324)",
+                    "Shōchū (1324–1326)",
+                    "Karyaku (1326–1329)",
+                    "Gentoku (1329–1331)",
+                    "Genkō (1331–1334)",
+                    "Kenmu (1334–1336)",
+                    "Engen (1336–1340)",
+                    "Kōkoku (1340–1346)",
+                    "Shōhei (1346–1370)",
+                    "Kentoku (1370–1372)",
+                    "BunchÅ« (1372â\80\931375)",
+                    "Tenju (1375–1379)",
+                    "Kōryaku (1379–1381)",
+                    "Kōwa (1381–1384)",
+                    "GenchÅ« (1384â\80\931392)",
+                    "Meitoku (1384–1387)",
+                    "Kakei (1387–1389)",
+                    "Kōō (1389–1390)",
+                    "Meitoku (1390–1394)",
+                    "Ōei (1394–1428)",
+                    "Shōchō (1428–1429)",
+                    "Eikyō (1429–1441)",
+                    "Kakitsu (1441–1444)",
+                    "Bun’an (1444–1449)",
+                    "Hōtoku (1449–1452)",
+                    "Kyōtoku (1452–1455)",
+                    "Kōshō (1455–1457)",
+                    "Chōroku (1457–1460)",
+                    "Kanshō (1460–1466)",
+                    "Bunshō (1466–1467)",
+                    "Ōnin (1467–1469)",
+                    "Bunmei (1469–1487)",
+                    "Chōkyō (1487–1489)",
+                    "Entoku (1489–1492)",
+                    "Meiō (1492–1501)",
+                    "Bunki (1501–1504)",
+                    "Eishō (1504–1521)",
+                    "Taiei (1521–1528)",
+                    "Kyōroku (1528–1532)",
+                    "Tenbun (1532–1555)",
+                    "Kōji (1555–1558)",
+                    "Eiroku (1558–1570)",
+                    "Genki (1570–1573)",
+                    "Tenshō (1573–1592)",
+                    "Bunroku (1592–1596)",
+                    "Keichō (1596–1615)",
+                    "Genna (1615–1624)",
+                    "Kan’ei (1624–1644)",
+                    "Shōho (1644–1648)",
+                    "Keian (1648–1652)",
+                    "Jōō (1652–1655)",
+                    "Meireki (1655–1658)",
+                    "Manji (1658–1661)",
+                    "Kanbun (1661–1673)",
+                    "Enpō (1673–1681)",
+                    "Tenna (1681–1684)",
+                    "Jōkyō (1684–1688)",
+                    "Genroku (1688–1704)",
+                    "Hōei (1704–1711)",
+                    "Shōtoku (1711–1716)",
+                    "Kyōhō (1716–1736)",
+                    "Genbun (1736–1741)",
+                    "Kanpō (1741–1744)",
+                    "Enkyō (1744–1748)",
+                    "Kan’en (1748–1751)",
+                    "Hōreki (1751–1764)",
+                    "Meiwa (1764–1772)",
+                    "An’ei (1772–1781)",
+                    "Tenmei (1781–1789)",
+                    "Kansei (1789–1801)",
+                    "Kyōwa (1801–1804)",
+                    "Bunka (1804–1818)",
+                    "Bunsei (1818–1830)",
+                    "Tenpō (1830–1844)",
+                    "Kōka (1844–1848)",
+                    "Kaei (1848–1854)",
+                    "Ansei (1854–1860)",
+                    "Man’en (1860–1861)",
+                    "Bunkyū (1861–1864)",
+                    "Genji (1864–1865)",
+                    "Keiō (1865–1868)",
                      "Meiji",
                      "Taishō",
                      "Shōwa",
                      "Heisei",
                  }
                  narrow{
                      "Meiji",
                      "Taishō",
                      "Shōwa",
                      "Heisei",
                  }
                  narrow{
-                    "Taika (645-650)" /** (abbr.)  */,
-                    "Hakuchi (650-671)" /** (abbr.)  */,
-                    "Hakuhō (672-686)" /** (abbr.)  */,
-                    "Shuchō (686-701)" /** (abbr.)  */,
-                    "Taihō (701-704)" /** (abbr.)  */,
-                    "Keiun (704-708)" /** (abbr.)  */,
-                    "Wadō (708-715)" /** (abbr.)  */,
-                    "Reiki (715-717)" /** (abbr.)  */,
-                    "Yōrō (717-724)" /** (abbr.)  */,
-                    "Jinki (724-729)" /** (abbr.)  */,
-                    "Tempyō (729-749)" /** (abbr.)  */,
-                    "Tempyō-kampō (749-749)" /** (abbr.)  */,
-                    "Tempyō-shōhō (749-757)" /** (abbr.)  */,
-                    "Tempyō-hōji (757-765)" /** (abbr.)  */,
-                    "Temphō-jingo (765-767)" /** (abbr.)  */,
-                    "Jingo-keiun (767-770)" /** (abbr.)  */,
-                    "Hōki (770-780)" /** (abbr.)  */,
-                    "Ten-ō (781-782)" /** (abbr.)  */,
-                    "Enryaku (782-806)" /** (abbr.)  */,
-                    "Daidō (806-810)" /** (abbr.)  */,
-                    "Kōnin (810-824)" /** (abbr.)  */,
-                    "Tenchō (824-834)" /** (abbr.)  */,
-                    "Shōwa (834-848)" /** (abbr.)  */,
-                    "Kajō (848-851)" /** (abbr.)  */,
-                    "Ninju (851-854)" /** (abbr.)  */,
-                    "Saiko (854-857)" /** (abbr.)  */,
-                    "Tennan (857-859)" /** (abbr.)  */,
-                    "Jōgan (859-877)" /** (abbr.)  */,
-                    "Genkei (877-885)" /** (abbr.)  */,
-                    "Ninna (885-889)" /** (abbr.)  */,
-                    "Kampyō (889-898)" /** (abbr.)  */,
-                    "Shōtai (898-901)" /** (abbr.)  */,
-                    "Engi (901-923)" /** (abbr.)  */,
-                    "Enchō (923-931)" /** (abbr.)  */,
-                    "Shōhei (931-938)" /** (abbr.)  */,
-                    "Tengyō (938-947)" /** (abbr.)  */,
-                    "Tenryaku (947-957)" /** (abbr.)  */,
-                    "Tentoku (957-961)" /** (abbr.)  */,
-                    "Ōwa (961-964)" /** (abbr.)  */,
-                    "Kōhō (964-968)" /** (abbr.)  */,
-                    "Anna (968-970)" /** (abbr.)  */,
-                    "Tenroku (970-973)" /** (abbr.)  */,
-                    "Ten-en (973-976)" /** (abbr.)  */,
-                    "Jōgen (976-978)" /** (abbr.)  */,
-                    "Tengen (978-983)" /** (abbr.)  */,
-                    "Eikan (983-985)" /** (abbr.)  */,
-                    "Kanna (985-987)" /** (abbr.)  */,
-                    "Ei-en (987-989)" /** (abbr.)  */,
-                    "Eiso (989-990)" /** (abbr.)  */,
-                    "Shōryaku (990-995)" /** (abbr.)  */,
-                    "Chōtoku (995-999)" /** (abbr.)  */,
-                    "Chōhō (999-1004)" /** (abbr.)  */,
-                    "Kankō (1004-1012)" /** (abbr.)  */,
-                    "Chōwa (1012-1017)" /** (abbr.)  */,
-                    "Kannin (1017-1021)" /** (abbr.)  */,
-                    "Jian (1021-1024)" /** (abbr.)  */,
-                    "Manju (1024-1028)" /** (abbr.)  */,
-                    "Chōgen (1028-1037)" /** (abbr.)  */,
-                    "Chōryaku (1037-1040)" /** (abbr.)  */,
-                    "Chōkyū (1040-1044)" /** (abbr.)  */,
-                    "Kantoku (1044-1046)" /** (abbr.)  */,
-                    "Eishō (1046-1053)" /** (abbr.)  */,
-                    "Tengi (1053-1058)" /** (abbr.)  */,
-                    "Kōhei (1058-1065)" /** (abbr.)  */,
-                    "Jiryaku (1065-1069)" /** (abbr.)  */,
-                    "Enkyū (1069-1074)" /** (abbr.)  */,
-                    "Shōho (1074-1077)" /** (abbr.)  */,
-                    "Shōryaku (1077-1081)" /** (abbr.)  */,
-                    "Eiho (1081-1084)" /** (abbr.)  */,
-                    "Ōtoku (1084-1087)" /** (abbr.)  */,
-                    "Kanji (1087-1094)" /** (abbr.)  */,
-                    "Kaho (1094-1096)" /** (abbr.)  */,
-                    "Eichō (1096-1097)" /** (abbr.)  */,
-                    "Shōtoku (1097-1099)" /** (abbr.)  */,
-                    "Kōwa (1099-1104)" /** (abbr.)  */,
-                    "Chōji (1104-1106)" /** (abbr.)  */,
-                    "Kashō (1106-1108)" /** (abbr.)  */,
-                    "Tennin (1108-1110)" /** (abbr.)  */,
-                    "Ten-ei (1110-1113)" /** (abbr.)  */,
-                    "Eikyū (1113-1118)" /** (abbr.)  */,
-                    "Gen-ei (1118-1120)" /** (abbr.)  */,
-                    "Hoan (1120-1124)" /** (abbr.)  */,
-                    "Tenji (1124-1126)" /** (abbr.)  */,
-                    "Daiji (1126-1131)" /** (abbr.)  */,
-                    "Tenshō (1131-1132)" /** (abbr.)  */,
-                    "Chōshō (1132-1135)" /** (abbr.)  */,
-                    "Hoen (1135-1141)" /** (abbr.)  */,
-                    "Eiji (1141-1142)" /** (abbr.)  */,
-                    "Kōji (1142-1144)" /** (abbr.)  */,
-                    "Tenyō (1144-1145)" /** (abbr.)  */,
-                    "Kyūan (1145-1151)" /** (abbr.)  */,
-                    "Ninpei (1151-1154)" /** (abbr.)  */,
-                    "Kyūju (1154-1156)" /** (abbr.)  */,
-                    "Hogen (1156-1159)" /** (abbr.)  */,
-                    "Heiji (1159-1160)" /** (abbr.)  */,
-                    "Eiryaku (1160-1161)" /** (abbr.)  */,
-                    "Ōho (1161-1163)" /** (abbr.)  */,
-                    "Chōkan (1163-1165)" /** (abbr.)  */,
-                    "Eiman (1165-1166)" /** (abbr.)  */,
-                    "Nin-an (1166-1169)" /** (abbr.)  */,
-                    "Kaō (1169-1171)" /** (abbr.)  */,
-                    "Shōan (1171-1175)" /** (abbr.)  */,
-                    "Angen (1175-1177)" /** (abbr.)  */,
-                    "Jishō (1177-1181)" /** (abbr.)  */,
-                    "Yōwa (1181-1182)" /** (abbr.)  */,
-                    "Juei (1182-1184)" /** (abbr.)  */,
-                    "Genryuku (1184-1185)" /** (abbr.)  */,
-                    "Bunji (1185-1190)" /** (abbr.)  */,
-                    "Kenkyū (1190-1199)" /** (abbr.)  */,
-                    "Shōji (1199-1201)" /** (abbr.)  */,
-                    "Kennin (1201-1204)" /** (abbr.)  */,
-                    "Genkyū (1204-1206)" /** (abbr.)  */,
-                    "Ken-ei (1206-1207)" /** (abbr.)  */,
-                    "Shōgen (1207-1211)" /** (abbr.)  */,
-                    "Kenryaku (1211-1213)" /** (abbr.)  */,
-                    "Kenpō (1213-1219)" /** (abbr.)  */,
-                    "Shōkyū (1219-1222)" /** (abbr.)  */,
-                    "Jōō (1222-1224)" /** (abbr.)  */,
-                    "Gennin (1224-1225)" /** (abbr.)  */,
-                    "Karoku (1225-1227)" /** (abbr.)  */,
-                    "Antei (1227-1229)" /** (abbr.)  */,
-                    "Kanki (1229-1232)" /** (abbr.)  */,
-                    "Jōei (1232-1233)" /** (abbr.)  */,
-                    "Tempuku (1233-1234)" /** (abbr.)  */,
-                    "Bunryaku (1234-1235)" /** (abbr.)  */,
-                    "Katei (1235-1238)" /** (abbr.)  */,
-                    "Ryakunin (1238-1239)" /** (abbr.)  */,
-                    "En-ō (1239-1240)" /** (abbr.)  */,
-                    "Ninji (1240-1243)" /** (abbr.)  */,
-                    "Kangen (1243-1247)" /** (abbr.)  */,
-                    "Hōji (1247-1249)" /** (abbr.)  */,
-                    "Kenchō (1249-1256)" /** (abbr.)  */,
-                    "Kōgen (1256-1257)" /** (abbr.)  */,
-                    "Shōka (1257-1259)" /** (abbr.)  */,
-                    "Shōgen (1259-1260)" /** (abbr.)  */,
-                    "Bun-ō (1260-1261)" /** (abbr.)  */,
-                    "Kōchō (1261-1264)" /** (abbr.)  */,
-                    "Bun-ei (1264-1275)" /** (abbr.)  */,
-                    "Kenji (1275-1278)" /** (abbr.)  */,
-                    "Kōan (1278-1288)" /** (abbr.)  */,
-                    "Shōō (1288-1293)" /** (abbr.)  */,
-                    "Einin (1293-1299)" /** (abbr.)  */,
-                    "Shōan (1299-1302)" /** (abbr.)  */,
-                    "Kengen (1302-1303)" /** (abbr.)  */,
-                    "Kagen (1303-1306)" /** (abbr.)  */,
-                    "Tokuji (1306-1308)" /** (abbr.)  */,
-                    "Enkei (1308-1311)" /** (abbr.)  */,
-                    "Ōchō (1311-1312)" /** (abbr.)  */,
-                    "Shōwa (1312-1317)" /** (abbr.)  */,
-                    "Bunpō (1317-1319)" /** (abbr.)  */,
-                    "Genō (1319-1321)" /** (abbr.)  */,
-                    "Genkyō (1321-1324)" /** (abbr.)  */,
-                    "Shōchū (1324-1326)" /** (abbr.)  */,
-                    "Kareki (1326-1329)" /** (abbr.)  */,
-                    "Gentoku (1329-1331)" /** (abbr.)  */,
-                    "Genkō (1331-1334)" /** (abbr.)  */,
-                    "Kemmu (1334-1336)" /** (abbr.)  */,
-                    "Engen (1336-1340)" /** (abbr.)  */,
-                    "Kōkoku (1340-1346)" /** (abbr.)  */,
-                    "Shōhei (1346-1370)" /** (abbr.)  */,
-                    "Kentoku (1370-1372)" /** (abbr.)  */,
-                    "BunchÅ© (1372-1375)" /** (abbr.)  */,
-                    "Tenju (1375-1379)" /** (abbr.)  */,
-                    "Kōryaku (1379-1381)" /** (abbr.)  */,
-                    "Kōwa (1381-1384)" /** (abbr.)  */,
-                    "GenchÅ© (1384-1392)" /** (abbr.)  */,
-                    "Meitoku (1384-1387)" /** (abbr.)  */,
-                    "Kakei (1387-1389)" /** (abbr.)  */,
-                    "Kōō (1389-1390)" /** (abbr.)  */,
-                    "Meitoku (1390-1394)" /** (abbr.)  */,
-                    "Ōei (1394-1428)" /** (abbr.)  */,
-                    "Shōchō (1428-1429)" /** (abbr.)  */,
-                    "Eikyō (1429-1441)" /** (abbr.)  */,
-                    "Kakitsu (1441-1444)" /** (abbr.)  */,
-                    "Bun-an (1444-1449)" /** (abbr.)  */,
-                    "Hōtoku (1449-1452)" /** (abbr.)  */,
-                    "Kyōtoku (1452-1455)" /** (abbr.)  */,
-                    "Kōshō (1455-1457)" /** (abbr.)  */,
-                    "Chōroku (1457-1460)" /** (abbr.)  */,
-                    "Kanshō (1460-1466)" /** (abbr.)  */,
-                    "Bunshō (1466-1467)" /** (abbr.)  */,
-                    "Ōnin (1467-1469)" /** (abbr.)  */,
-                    "Bunmei (1469-1487)" /** (abbr.)  */,
-                    "Chōkyō (1487-1489)" /** (abbr.)  */,
-                    "Entoku (1489-1492)" /** (abbr.)  */,
-                    "Meiō (1492-1501)" /** (abbr.)  */,
-                    "Bunki (1501-1504)" /** (abbr.)  */,
-                    "Eishō (1504-1521)" /** (abbr.)  */,
-                    "Taiei (1521-1528)" /** (abbr.)  */,
-                    "Kyōroku (1528-1532)" /** (abbr.)  */,
-                    "Tenmon (1532-1555)" /** (abbr.)  */,
-                    "Kōji (1555-1558)" /** (abbr.)  */,
-                    "Eiroku (1558-1570)" /** (abbr.)  */,
-                    "Genki (1570-1573)" /** (abbr.)  */,
-                    "Tenshō (1573-1592)" /** (abbr.)  */,
-                    "Bunroku (1592-1596)" /** (abbr.)  */,
-                    "Keichō (1596-1615)" /** (abbr.)  */,
-                    "Genwa (1615-1624)" /** (abbr.)  */,
-                    "Kan-ei (1624-1644)" /** (abbr.)  */,
-                    "Shōho (1644-1648)" /** (abbr.)  */,
-                    "Keian (1648-1652)" /** (abbr.)  */,
-                    "Shōō (1652-1655)" /** (abbr.)  */,
-                    "Meiryaku (1655-1658)" /** (abbr.)  */,
-                    "Manji (1658-1661)" /** (abbr.)  */,
-                    "Kanbun (1661-1673)" /** (abbr.)  */,
-                    "Enpō (1673-1681)" /** (abbr.)  */,
-                    "Tenwa (1681-1684)" /** (abbr.)  */,
-                    "Jōkyō (1684-1688)" /** (abbr.)  */,
-                    "Genroku (1688-1704)" /** (abbr.)  */,
-                    "Hōei (1704-1711)" /** (abbr.)  */,
-                    "Shōtoku (1711-1716)" /** (abbr.)  */,
-                    "Kyōhō (1716-1736)" /** (abbr.)  */,
-                    "Genbun (1736-1741)" /** (abbr.)  */,
-                    "Kanpō (1741-1744)" /** (abbr.)  */,
-                    "Enkyō (1744-1748)" /** (abbr.)  */,
-                    "Kan-en (1748-1751)" /** (abbr.)  */,
-                    "Hōryaku (1751-1764)" /** (abbr.)  */,
-                    "Meiwa (1764-1772)" /** (abbr.)  */,
-                    "An-ei (1772-1781)" /** (abbr.)  */,
-                    "Tenmei (1781-1789)" /** (abbr.)  */,
-                    "Kansei (1789-1801)" /** (abbr.)  */,
-                    "Kyōwa (1801-1804)" /** (abbr.)  */,
-                    "Bunka (1804-1818)" /** (abbr.)  */,
-                    "Bunsei (1818-1830)" /** (abbr.)  */,
-                    "Tenpō (1830-1844)" /** (abbr.)  */,
-                    "Kōka (1844-1848)" /** (abbr.)  */,
-                    "Kaei (1848-1854)" /** (abbr.)  */,
-                    "Ansei (1854-1860)" /** (abbr.)  */,
-                    "Man-en (1860-1861)" /** (abbr.)  */,
-                    "Bunkyū (1861-1864)" /** (abbr.)  */,
-                    "Genji (1864-1865)" /** (abbr.)  */,
-                    "Keiō (1865-1868)" /** (abbr.)  */,
+                    "Taika (645–650)",
+                    "Hakuchi (650–671)",
+                    "Hakuhō (672–686)",
+                    "Shuchō (686–701)",
+                    "Taihō (701–704)",
+                    "Keiun (704–708)",
+                    "Wadō (708–715)",
+                    "Reiki (715–717)",
+                    "Yōrō (717–724)",
+                    "Jinki (724–729)",
+                    "Tenpyō (729–749)",
+                    "Tenpyō-kampō (749-749)",
+                    "Tenpyō-shōhō (749-757)",
+                    "Tenpyō-hōji (757-765)",
+                    "Tenpyō-jingo (765-767)",
+                    "Jingo-keiun (767-770)",
+                    "Hōki (770–780)",
+                    "Ten-ō (781-782)",
+                    "Enryaku (782–806)",
+                    "Daidō (806–810)",
+                    "Kōnin (810–824)",
+                    "Tenchō (824–834)",
+                    "Jōwa (834–848)",
+                    "Kajō (848–851)",
+                    "Ninju (851–854)",
+                    "Saikō (854–857)",
+                    "Ten-an (857-859)",
+                    "Jōgan (859–877)",
+                    "Gangyō (877–885)",
+                    "Ninna (885–889)",
+                    "Kanpyō (889–898)",
+                    "Shōtai (898–901)",
+                    "Engi (901–923)",
+                    "Enchō (923–931)",
+                    "Jōhei (931–938)",
+                    "Tengyō (938–947)",
+                    "Tenryaku (947–957)",
+                    "Tentoku (957–961)",
+                    "Ōwa (961–964)",
+                    "Kōhō (964–968)",
+                    "Anna (968–970)",
+                    "Tenroku (970–973)",
+                    "Ten’en (973–976)",
+                    "Jōgen (976–978)",
+                    "Tengen (978–983)",
+                    "Eikan (983–985)",
+                    "Kanna (985–987)",
+                    "Eien (987–989)",
+                    "Eiso (989–990)",
+                    "Shōryaku (990–995)",
+                    "Chōtoku (995–999)",
+                    "Chōhō (999–1004)",
+                    "Kankō (1004–1012)",
+                    "Chōwa (1012–1017)",
+                    "Kannin (1017–1021)",
+                    "Jian (1021–1024)",
+                    "Manju (1024–1028)",
+                    "Chōgen (1028–1037)",
+                    "Chōryaku (1037–1040)",
+                    "Chōkyū (1040–1044)",
+                    "Kantoku (1044–1046)",
+                    "Eishō (1046–1053)",
+                    "Tengi (1053–1058)",
+                    "Kōhei (1058–1065)",
+                    "Jiryaku (1065–1069)",
+                    "Enkyū (1069–1074)",
+                    "Shōho (1074–1077)",
+                    "Shōryaku (1077–1081)",
+                    "Eihō (1081–1084)",
+                    "Ōtoku (1084–1087)",
+                    "Kanji (1087–1094)",
+                    "Kahō (1094–1096)",
+                    "Eichō (1096–1097)",
+                    "Jōtoku (1097–1099)",
+                    "Kōwa (1099–1104)",
+                    "Chōji (1104–1106)",
+                    "Kashō (1106–1108)",
+                    "Tennin (1108–1110)",
+                    "Ten-ei (1110-1113)",
+                    "Eikyū (1113–1118)",
+                    "Gen’ei (1118–1120)",
+                    "Hōan (1120–1124)",
+                    "Tenji (1124–1126)",
+                    "Daiji (1126–1131)",
+                    "Tenshō (1131–1132)",
+                    "Chōshō (1132–1135)",
+                    "Hōen (1135–1141)",
+                    "Eiji (1141–1142)",
+                    "Kōji (1142–1144)",
+                    "Ten’yō (1144–1145)",
+                    "Kyūan (1145–1151)",
+                    "Ninpei (1151–1154)",
+                    "Kyūju (1154–1156)",
+                    "Hōgen (1156–1159)",
+                    "Heiji (1159–1160)",
+                    "Eiryaku (1160–1161)",
+                    "Ōho (1161–1163)",
+                    "Chōkan (1163–1165)",
+                    "Eiman (1165–1166)",
+                    "Nin’an (1166–1169)",
+                    "Kaō (1169–1171)",
+                    "Shōan (1171–1175)",
+                    "Angen (1175–1177)",
+                    "Jishō (1177–1181)",
+                    "Yōwa (1181–1182)",
+                    "Juei (1182–1184)",
+                    "Genryaku (1184–1185)",
+                    "Bunji (1185–1190)",
+                    "Kenkyū (1190–1199)",
+                    "Shōji (1199–1201)",
+                    "Kennin (1201–1204)",
+                    "Genkyū (1204–1206)",
+                    "Ken’ei (1206–1207)",
+                    "Jōgen (1207–1211)",
+                    "Kenryaku (1211–1213)",
+                    "Kenpō (1213–1219)",
+                    "Jōkyū (1219–1222)",
+                    "Jōō (1222–1224)",
+                    "Gennin (1224–1225)",
+                    "Karoku (1225–1227)",
+                    "Antei (1227–1229)",
+                    "Kanki (1229–1232)",
+                    "Jōei (1232–1233)",
+                    "Tenpuku (1233–1234)",
+                    "Bunryaku (1234–1235)",
+                    "Katei (1235–1238)",
+                    "Ryakunin (1238–1239)",
+                    "En’ō (1239–1240)",
+                    "Ninji (1240–1243)",
+                    "Kangen (1243–1247)",
+                    "Hōji (1247–1249)",
+                    "Kenchō (1249–1256)",
+                    "Kōgen (1256–1257)",
+                    "Shōka (1257–1259)",
+                    "Shōgen (1259–1260)",
+                    "Bun’ō (1260–1261)",
+                    "Kōchō (1261–1264)",
+                    "Bun’ei (1264–1275)",
+                    "Kenji (1275–1278)",
+                    "Kōan (1278–1288)",
+                    "Shōō (1288–1293)",
+                    "Einin (1293–1299)",
+                    "Shōan (1299–1302)",
+                    "Kengen (1302–1303)",
+                    "Kagen (1303–1306)",
+                    "Tokuji (1306–1308)",
+                    "Enkyō (1308–1311)",
+                    "Ōchō (1311–1312)",
+                    "Shōwa (1312–1317)",
+                    "Bunpō (1317–1319)",
+                    "Genō (1319–1321)",
+                    "Genkō (1321–1324)",
+                    "Shōchū (1324–1326)",
+                    "Karyaku (1326–1329)",
+                    "Gentoku (1329–1331)",
+                    "Genkō (1331–1334)",
+                    "Kenmu (1334–1336)",
+                    "Engen (1336–1340)",
+                    "Kōkoku (1340–1346)",
+                    "Shōhei (1346–1370)",
+                    "Kentoku (1370–1372)",
+                    "BunchÅ« (1372â\80\931375)",
+                    "Tenju (1375–1379)",
+                    "Kōryaku (1379–1381)",
+                    "Kōwa (1381–1384)",
+                    "GenchÅ« (1384â\80\931392)",
+                    "Meitoku (1384–1387)",
+                    "Kakei (1387–1389)",
+                    "Kōō (1389–1390)",
+                    "Meitoku (1390–1394)",
+                    "Ōei (1394–1428)",
+                    "Shōchō (1428–1429)",
+                    "Eikyō (1429–1441)",
+                    "Kakitsu (1441–1444)",
+                    "Bun’an (1444–1449)",
+                    "Hōtoku (1449–1452)",
+                    "Kyōtoku (1452–1455)",
+                    "Kōshō (1455–1457)",
+                    "Chōroku (1457–1460)",
+                    "Kanshō (1460–1466)",
+                    "Bunshō (1466–1467)",
+                    "Ōnin (1467–1469)",
+                    "Bunmei (1469–1487)",
+                    "Chōkyō (1487–1489)",
+                    "Entoku (1489–1492)",
+                    "Meiō (1492–1501)",
+                    "Bunki (1501–1504)",
+                    "Eishō (1504–1521)",
+                    "Taiei (1521–1528)",
+                    "Kyōroku (1528–1532)",
+                    "Tenbun (1532–1555)",
+                    "Kōji (1555–1558)",
+                    "Eiroku (1558–1570)",
+                    "Genki (1570–1573)",
+                    "Tenshō (1573–1592)",
+                    "Bunroku (1592–1596)",
+                    "Keichō (1596–1615)",
+                    "Genna (1615–1624)",
+                    "Kan’ei (1624–1644)",
+                    "Shōho (1644–1648)",
+                    "Keian (1648–1652)",
+                    "Jōō (1652–1655)",
+                    "Meireki (1655–1658)",
+                    "Manji (1658–1661)",
+                    "Kanbun (1661–1673)",
+                    "Enpō (1673–1681)",
+                    "Tenna (1681–1684)",
+                    "Jōkyō (1684–1688)",
+                    "Genroku (1688–1704)",
+                    "Hōei (1704–1711)",
+                    "Shōtoku (1711–1716)",
+                    "Kyōhō (1716–1736)",
+                    "Genbun (1736–1741)",
+                    "Kanpō (1741–1744)",
+                    "Enkyō (1744–1748)",
+                    "Kan’en (1748–1751)",
+                    "Hōreki (1751–1764)",
+                    "Meiwa (1764–1772)",
+                    "An’ei (1772–1781)",
+                    "Tenmei (1781–1789)",
+                    "Kansei (1789–1801)",
+                    "Kyōwa (1801–1804)",
+                    "Bunka (1804–1818)",
+                    "Bunsei (1818–1830)",
+                    "Tenpō (1830–1844)",
+                    "Kōka (1844–1848)",
+                    "Kaei (1848–1854)",
+                    "Ansei (1854–1860)",
+                    "Man’en (1860–1861)",
+                    "Bunkyū (1861–1864)",
+                    "Genji (1864–1865)",
+                    "Keiō (1865–1868)",
                      "M",
                      "T",
                      "S",
                      "M",
                      "T",
                      "S",
@@ -1625,14 +1925,18 @@ root{
                  }
                  wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
              }
                  }
                  wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
              }
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
          persian{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
              monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
          persian{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
@@ -1641,12 +1945,10 @@ root{
                  narrow:alias{"/LOCALE/calendar/persian/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/persian/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/persian/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/persian/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames{
              monthNames{
-                default{"format"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/persian/monthNames/format/wide"}
                  format{
                      abbreviated:alias{"/LOCALE/calendar/persian/monthNames/format/wide"}
-                    default{"wide"}
                      narrow:alias{"/LOCALE/calendar/persian/monthNames/stand-alone/narrow"}
                      wide{
                          "Farvardin",
                      narrow:alias{"/LOCALE/calendar/persian/monthNames/stand-alone/narrow"}
                      wide{
                          "Farvardin",
@@ -1686,62 +1988,12 @@ root{
          }
          roc{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
          }
          roc{
              AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, G y MMMM dd",
-                "G y MMMM d",
-                "G y MMM d",
-                "GGGGG yyy-MM-dd",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-            }
-            appendItems{
-                Day{"{0} ({2}: {1})"}
-                Day-Of-Week{"{0} {1}"}
-                Era{"{0} {1}"}
-                Hour{"{0} ({2}: {1})"}
-                Minute{"{0} ({2}: {1})"}
-                Month{"{0} ({2}: {1})"}
-                Quarter{"{0} ({2}: {1})"}
-                Second{"{0} ({2}: {1})"}
-                Timezone{"{0} {1}"}
-                Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
-            }
-            availableFormats{
-                Ed{"d E"}
-                Gy{"G y"}
-                H{"HH"}
-                Hm{"HH:mm"}
-                Hms{"HH:mm:ss"}
-                M{"L"}
-                MEd{"E, M-d"}
-                MMM{"LLL"}
-                MMMEd{"E MMM d"}
-                MMMd{"MMM d"}
-                Md{"M-d"}
-                d{"d"}
-                h{"h a"}
-                hm{"h:mm a"}
-                hms{"h:mm:ss a"}
-                ms{"mm:ss"}
-                y{"G y"}
-                yyyy{"G y"}
-                yyyyM{"GGGGG yyy-MM"}
-                yyyyMEd{"E, GGGGG yyy-MM-dd"}
-                yyyyMMM{"G y MMM"}
-                yyyyMMMEd{"E, G y MMM d"}
-                yyyyMMMd{"G y MMM d"}
-                yyyyMd{"GGGGG yyy-MM-dd"}
-                yyyyQ{"GGGGG yyy Q"}
-                yyyyQQQ{"G y QQQ"}
-            }
+            AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+            NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
              dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
              eras{
                  abbreviated{
@@ -1751,7 +2003,7 @@ root{
                  narrow:alias{"/LOCALE/calendar/roc/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/roc/eras/abbreviated"}
              }
                  narrow:alias{"/LOCALE/calendar/roc/eras/abbreviated"}
                  wide:alias{"/LOCALE/calendar/roc/eras/abbreviated"}
              }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
              monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
              monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"}
              quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
          }
@@ -1762,86 +2014,248 @@ root{
          quotationEnd{"”"}
          quotationStart{"“"}
      }
          quotationEnd{"”"}
          quotationStart{"“"}
      }
-    layout{
-        characters{"left-to-right"}
-        lines{"top-to-bottom"}
-    }
-    listPattern{
-        standard{
-            2{"{0}, {1}"}
-            end{"{0}, {1}"}
-            middle{"{0}, {1}"}
-            start{"{0}, {1}"}
-        }
-    }
-    measurementSystemNames{
-        UK{"UK"}
-        US{"US"}
-        metric{"Metric"}
-    }
-    units{
+    fields{
          day{
          day{
-            other{"{0} d"}
-        }
-        day-future{
-            other{"+{0} d"}
+            dn{"Day"}
+            relative{
+                "-1"{"yesterday"}
+                "0"{"today"}
+                "1"{"tomorrow"}
+            }
+            relativeTime{
+                future{
+                    other{"+{0} d"}
+                }
+                past{
+                    other{"-{0} d"}
+                }
+            }
          }
          }
-        day-past{
-            other{"-{0} d"}
+        day-narrow:alias{"/LOCALE/fields/day-short"}
+        day-short:alias{"/LOCALE/fields/day"}
+        dayperiod{
+            dn{"Dayperiod"}
          }
          }
-        hour{
-            other{"{0} h"}
+        era{
+            dn{"Era"}
          }
          }
-        hour-future{
-            other{"+{0} h"}
+        fri{
+            relative{
+                "-1"{"last Friday"}
+                "0"{"this Friday"}
+                "1"{"next Friday"}
+            }
          }
          }
-        hour-past{
-            other{"-{0} h"}
+        fri-narrow:alias{"/LOCALE/fields/fri-short"}
+        fri-short:alias{"/LOCALE/fields/fri"}
+        hour{
+            dn{"Hour"}
+            relativeTime{
+                future{
+                    other{"+{0} h"}
+                }
+                past{
+                    other{"-{0} h"}
+                }
+            }
          }
          }
+        hour-narrow:alias{"/LOCALE/fields/hour-short"}
+        hour-short:alias{"/LOCALE/fields/hour"}
          minute{
          minute{
-            other{"{0} min"}
-        }
-        minute-future{
-            other{"+{0} min"}
+            dn{"Minute"}
+            relativeTime{
+                future{
+                    other{"+{0} min"}
+                }
+                past{
+                    other{"-{0} min"}
+                }
+            }
          }
          }
-        minute-past{
-            other{"-{0} min"}
+        minute-narrow:alias{"/LOCALE/fields/minute-short"}
+        minute-short:alias{"/LOCALE/fields/minute"}
+        mon{
+            relative{
+                "-1"{"last Monday"}
+                "0"{"this Monday"}
+                "1"{"next Monday"}
+            }
          }
          }
+        mon-narrow:alias{"/LOCALE/fields/mon-short"}
+        mon-short:alias{"/LOCALE/fields/mon"}
          month{
          month{
-            other{"{0} m"}
+            dn{"Month"}
+            relative{
+                "-1"{"last month"}
+                "0"{"this month"}
+                "1"{"next month"}
+            }
+            relativeTime{
+                future{
+                    other{"+{0} m"}
+                }
+                past{
+                    other{"-{0} m"}
+                }
+            }
          }
          }
-        month-future{
-            other{"+{0} m"}
+        month-narrow:alias{"/LOCALE/fields/month-short"}
+        month-short:alias{"/LOCALE/fields/month"}
+        quarter{
+            dn{"Quarter"}
+            relative{
+                "-1"{"last quarter"}
+                "0"{"this quarter"}
+                "1"{"next quarter"}
+            }
+            relativeTime{
+                future{
+                    other{"+{0} Q"}
+                }
+                past{
+                    other{"-{0} Q"}
+                }
+            }
          }
          }
-        month-past{
-            other{"-{0} m"}
+        quarter-narrow:alias{"/LOCALE/fields/quarter-short"}
+        quarter-short:alias{"/LOCALE/fields/quarter"}
+        sat{
+            relative{
+                "-1"{"last Saturday"}
+                "0"{"this Saturday"}
+                "1"{"next Saturday"}
+            }
          }
          }
+        sat-narrow:alias{"/LOCALE/fields/sat-short"}
+        sat-short:alias{"/LOCALE/fields/sat"}
          second{
          second{
-            other{"{0} s"}
+            dn{"Second"}
+            relative{
+                "0"{"now"}
+            }
+            relativeTime{
+                future{
+                    other{"+{0} s"}
+                }
+                past{
+                    other{"-{0} s"}
+                }
+            }
          }
          }
-        second-future{
-            other{"+{0} s"}
+        second-narrow:alias{"/LOCALE/fields/second-short"}
+        second-short:alias{"/LOCALE/fields/second"}
+        sun{
+            relative{
+                "-1"{"last Sunday"}
+                "0"{"this Sunday"}
+                "1"{"next Sunday"}
+            }
          }
          }
-        second-past{
-            other{"-{0} s"}
+        sun-narrow:alias{"/LOCALE/fields/sun-short"}
+        sun-short:alias{"/LOCALE/fields/sun"}
+        thu{
+            relative{
+                "-1"{"last Thursday"}
+                "0"{"this Thursday"}
+                "1"{"next Thursday"}
+            }
          }
          }
-        week{
-            other{"{0} w"}
+        thu-narrow:alias{"/LOCALE/fields/thu-short"}
+        thu-short:alias{"/LOCALE/fields/thu"}
+        tue{
+            relative{
+                "-1"{"last Tuesday"}
+                "0"{"this Tuesday"}
+                "1"{"next Tuesday"}
+            }
+        }
+        tue-narrow:alias{"/LOCALE/fields/tue-short"}
+        tue-short:alias{"/LOCALE/fields/tue"}
+        wed{
+            relative{
+                "-1"{"last Wednesday"}
+                "0"{"this Wednesday"}
+                "1"{"next Wednesday"}
+            }
          }
          }
-        week-future{
-            other{"+{0} w"}
+        wed-narrow:alias{"/LOCALE/fields/wed-short"}
+        wed-short:alias{"/LOCALE/fields/wed"}
+        week{
+            dn{"Week"}
+            relative{
+                "-1"{"last week"}
+                "0"{"this week"}
+                "1"{"next week"}
+            }
+            relativeTime{
+                future{
+                    other{"+{0} w"}
+                }
+                past{
+                    other{"-{0} w"}
+                }
+            }
          }
          }
-        week-past{
-            other{"-{0} w"}
+        week-narrow:alias{"/LOCALE/fields/week-short"}
+        week-short:alias{"/LOCALE/fields/week"}
+        weekday{
+            dn{"Day of the Week"}
          }
          year{
          }
          year{
-            other{"{0} y"}
+            dn{"Year"}
+            relative{
+                "-1"{"last year"}
+                "0"{"this year"}
+                "1"{"next year"}
+            }
+            relativeTime{
+                future{
+                    other{"+{0} y"}
+                }
+                past{
+                    other{"-{0} y"}
+                }
+            }
          }
          }
-        year-future{
-            other{"+{0} y"}
+        year-narrow:alias{"/LOCALE/fields/year-short"}
+        year-short:alias{"/LOCALE/fields/year"}
+        zone{
+            dn{"Zone"}
          }
          }
-        year-past{
-            other{"-{0} y"}
+    }
+    layout{
+        characters{"left-to-right"}
+        lines{"top-to-bottom"}
+    }
+    listPattern{
+        standard{
+            2{"{0}, {1}"}
+            end{"{0}, {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
+        }
+        unit{
+            2:alias{"/LOCALE/listPattern/unit-short/2"}
+            end:alias{"/LOCALE/listPattern/unit-short/end"}
+            middle:alias{"/LOCALE/listPattern/unit-short/middle"}
+            start:alias{"/LOCALE/listPattern/unit-short/start"}
+        }
+        unit-narrow{
+            2:alias{"/LOCALE/listPattern/unit-short/2"}
+            end:alias{"/LOCALE/listPattern/unit-short/end"}
+            middle:alias{"/LOCALE/listPattern/unit-short/middle"}
+            start:alias{"/LOCALE/listPattern/unit-short/start"}
+        }
+        unit-short{
+            2:alias{"/LOCALE/listPattern/standard/2"}
+            end:alias{"/LOCALE/listPattern/standard/end"}
+            middle:alias{"/LOCALE/listPattern/standard/middle"}
+            start:alias{"/LOCALE/listPattern/standard/start"}
          }
      }
          }
      }
+    measurementSystemNames{
+        UK{"UK"}
+        US{"US"}
+        metric{"Metric"}
+    }
  }
  }