]> git.saurik.com Git - apple/icu.git/blobdiff - icuSources/data/locales/root.txt
ICU-511.31.tar.gz
[apple/icu.git] / icuSources / data / locales / root.txt
index e477a4163e3d9b795542c318955d6af4f8ac9936..6d509b4269eddafecc0574ff473d1ffa4f616997 100644 (file)
@@ -1,9 +1,9 @@
 // ***************************************************************************
 // *
-// * 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) 2013 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/root.xml
 // *
 // ***************************************************************************
 /**
@@ -12,8 +12,7 @@
 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{"[\- , ; \: ! ? . ( ) \[ \] \{ \}]"}
+    ExemplarCharactersPunctuation{"[\\- , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"}
     LocaleScript{
         "Zyyy",
     }
@@ -55,6 +54,46 @@ root{
                 percentFormat{"#,##0%"}
                 scientificFormat{"#E0"}
             }
+            patternsShort{
+                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"}
@@ -74,65 +113,13 @@ root{
         297,
         210,
     }
-    Version{"2.0.67.6"}
+    Version{"2.0.82.45"}
     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"}
-            }
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -141,7 +128,7 @@ root{
                 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"}
         }
@@ -152,10 +139,10 @@ root{
                 "HH:mm:ss z",
                 "HH:mm:ss",
                 "HH:mm",
-                "EEEE, U MMMM dd",
+                "U MMMM d, EEEE",
                 "U MMMM d",
                 "U MMM d",
-                "y-M-d",
+                "y-MM-dd",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
@@ -165,7 +152,7 @@ root{
             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})"}
@@ -173,33 +160,39 @@ root{
                 Second{"{0} ({2}: {1})"}
                 Timezone{"{0} {1}"}
                 Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
+                Year{"{1} {0}"}
             }
             availableFormats{
-                Ed{"d E"}
+                Ed{"d, E"}
+                Gy{"U"}
+                GyMMM{"U MMM"}
+                GyMMMEd{"U MMM d, E"}
+                GyMMMd{"U MMM d"}
                 H{"HH"}
                 Hm{"HH:mm"}
                 Hms{"HH:mm:ss"}
                 M{"L"}
-                MEd{"E, M-d"}
+                MEd{"MM-dd, E"}
                 MMM{"LLL"}
-                MMMEd{"E MMM d"}
+                MMMEd{"MMM d, E"}
                 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"}
                 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"}
+                yMd{"y-MM-dd"}
+                yyyy{"U"}
+                yyyyM{"y-MM"}
+                yyyyMEd{"y-MM-dd, E"}
+                yyyyMMM{"U MMM"}
+                yyyyMMMEd{"U MMM d, E"}
+                yyyyMMMd{"U MMM d"}
+                yyyyMd{"y-MM-dd"}
+                yyyyQQQ{"U QQQ"}
+                yyyyQQQQ{"U QQQQ"}
             }
             cyclicNameSets{
                 dayParts{
@@ -292,49 +285,50 @@ root{
                         wide:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years/format/abbreviated"}
                     }
                 }
-                zodiacs:alias{"/LOCALE/calendar/chinese/cyclicNameSets/dayParts"}
+                zodiacs{
+                    format{
+                        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"}
-                    a{"HH–HH"}
                 }
                 Hm{
                     H{"HH:mm–HH:mm"}
-                    a{"HH:mm–HH:mm"}
                     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"}
-                    a{"HH–HH v"}
                 }
                 M{
-                    M{"MM"}
+                    M{"MM–MM"}
                 }
                 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{
-                    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{
-                    M{"MM-d – MM-d"}
-                    d{"MM-d – d"}
+                    M{"MMM d – MMM d"}
+                    d{"MMM d–d"}
                 }
                 Md{
                     M{"MM-dd – MM-dd"}
-                    d{"MM-dd – dd"}
+                    d{"MM-dd – MM-dd"}
                 }
                 d{
                     d{"d–d"}
@@ -359,60 +353,58 @@ root{
                     h{"h–h a v"}
                 }
                 y{
-                    y{"y–y"}
+                    y{"U–U"}
                 }
                 yM{
-                    M{"y-MM – MM"}
+                    M{"y-MM – y-MM"}
                     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{
-                    M{"U MMM – MMM"}
+                    M{"U MMMMMM"}
                     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{
-                    M{"U MMMM – MMMM"}
+                    M{"U MMMMMMMM"}
                     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{
-                    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{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/chinese/monthNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/chinese/monthNames/stand-alone/narrow"}
                     wide{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                        "8",
-                        "9",
-                        "10",
-                        "11",
-                        "12",
+                        "Month1",
+                        "Month2",
+                        "Month3",
+                        "Month4",
+                        "Month5",
+                        "Month6",
+                        "Month7",
+                        "Month8",
+                        "Month9",
+                        "Month10",
+                        "Month11",
+                        "Month12",
                     }
                 }
                 stand-alone{
@@ -459,9 +451,9 @@ root{
         }
         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"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -471,12 +463,10 @@ root{
                 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{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/coptic/monthNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/coptic/monthNames/stand-alone/narrow"}
                     wide{
                         "Tout",
@@ -516,12 +506,24 @@ root{
             }
             quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
         }
+        dangi{
+            AmPmMarkers:alias{"/LOCALE/calendar/chinese/AmPmMarkers"}
+            DateTimePatterns:alias{"/LOCALE/calendar/chinese/DateTimePatterns"}
+            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"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -531,12 +533,10 @@ root{
                 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{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/ethiopic/monthNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/ethiopic/monthNames/stand-alone/narrow"}
                     wide{
                         "Meskerem",
@@ -577,11 +577,11 @@ root{
             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"}
+            DateTimePatterns:alias{"/LOCALE/calendar/ethiopic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/ethiopic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/ethiopic/availableFormats"}
+            dayNames:alias{"/LOCALE/calendar/ethiopic/dayNames"}
             eras{
                 abbreviated{
                     "ERA0",
@@ -589,8 +589,213 @@ root{
                 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"}
+            quarters:alias{"/LOCALE/calendar/ethiopic/quarters"}
+        }
+        generic{
+            AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
+            DateTimePatterns{
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
+                "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}",
+            }
+            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{
+                Ed{"d, E"}
+                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"}
+                MEd{"MM-dd, E"}
+                MMM{"LLL"}
+                MMMEd{"MMM d, E"}
+                MMMd{"MMM d"}
+                Md{"MM-dd"}
+                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 y-MM"}
+                yyyyMEd{"GGGGG y-MM-dd, E"}
+                yyyyMMM{"G y MMM"}
+                yyyyMMMEd{"G y MMM d, E"}
+                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{
+                    "ERA0",
+                    "ERA1",
+                }
+                narrow:alias{"/LOCALE/calendar/generic/eras/abbreviated"}
+                wide:alias{"/LOCALE/calendar/generic/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{"G y–y"}
+                }
+                yM{
+                    M{"GGGGG y-MM – y-MM"}
+                    y{"GGGGG y-MM – y-MM"}
+                }
+                yMEd{
+                    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{
+                    M{"G y MMM–MMM"}
+                    y{"G y MMM – y MMM"}
+                }
+                yMMMEd{
+                    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{
+                    M{"G y MMMM–MMMM"}
+                    y{"G y MMMM – y MMMM"}
+                }
+                yMMMd{
+                    M{"G y MMM d – MMM d"}
+                    d{"G y MMM d–d"}
+                    y{"G y MMM d – y MMM d"}
+                }
+                yMd{
+                    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{
+                format{
+                    abbreviated:alias{"/LOCALE/calendar/generic/monthNames/format/wide"}
+                    narrow:alias{"/LOCALE/calendar/generic/monthNames/stand-alone/narrow"}
+                    wide{
+                        "Month1",
+                        "Month2",
+                        "Month3",
+                        "Month4",
+                        "Month5",
+                        "Month6",
+                        "Month7",
+                        "Month8",
+                        "Month9",
+                        "Month10",
+                        "Month11",
+                        "Month12",
+                    }
+                }
+                stand-alone{
+                    abbreviated:alias{"/LOCALE/calendar/generic/monthNames/format/abbreviated"}
+                    narrow{
+                        "1",
+                        "2",
+                        "3",
+                        "4",
+                        "5",
+                        "6",
+                        "7",
+                        "8",
+                        "9",
+                        "10",
+                        "11",
+                        "12",
+                    }
+                    wide:alias{"/LOCALE/calendar/generic/monthNames/format/wide"}
+                }
+            }
             quarters:alias{"/LOCALE/calendar/gregorian/quarters"}
         }
         gregorian{
@@ -603,7 +808,7 @@ root{
                 "HH:mm:ss z",
                 "HH:mm:ss",
                 "HH:mm",
-                "EEEE, y MMMM dd",
+                "y MMMM d, EEEE",
                 "y MMMM d",
                 "y MMM d",
                 "yyyy-MM-dd",
@@ -616,7 +821,7 @@ root{
             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})"}
@@ -624,61 +829,65 @@ root{
                 Second{"{0} ({2}: {1})"}
                 Timezone{"{0} {1}"}
                 Week{"{0} ({2}: {1})"}
-                Year{"{0} {1}"}
+                Year{"{1} {0}"}
             }
             availableFormats{
-                Ed{"d E"}
+                Ed{"d, E"}
+                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"}
-                MEd{"E, M-d"}
+                MEd{"MM-dd, E"}
                 MMM{"LLL"}
-                MMMEd{"E MMM d"}
+                MMMEd{"MMM d, E"}
                 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"}
                 y{"y"}
-                yM{"y-M"}
-                yMEd{"E, y-M-d"}
+                yM{"y-MM"}
+                yMEd{"y-MM-dd, E"}
                 yMMM{"y MMM"}
-                yMMMEd{"E, y MMM d"}
+                yMMMEd{"y MMM d, E"}
                 yMMMd{"y MMM d"}
-                yMd{"y-M-d"}
-                yQ{"y Q"}
+                yMd{"y-MM-dd"}
                 yQQQ{"y QQQ"}
+                yQQQQ{"y QQQQ"}
             }
             dayNames{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/gregorian/dayNames/stand-alone/narrow"}
+                    short:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
                     wide{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
+                        "Sun",
+                        "Mon",
+                        "Tue",
+                        "Wed",
+                        "Thu",
+                        "Fri",
+                        "Sat",
                     }
                 }
                 stand-alone{
                     abbreviated:alias{"/LOCALE/calendar/gregorian/dayNames/format/abbreviated"}
                     narrow{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
+                        "S",
+                        "M",
+                        "T",
+                        "W",
+                        "T",
+                        "F",
+                        "S",
                     }
+                    short:alias{"/LOCALE/calendar/gregorian/dayNames/format/short"}
                     wide:alias{"/LOCALE/calendar/gregorian/dayNames/format/wide"}
                 }
             }
@@ -690,86 +899,42 @@ root{
                 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"}
-                }
-            }
             intervalFormats{
                 H{
                     H{"HH–HH"}
-                    a{"HH–HH"}
                 }
                 Hm{
                     H{"HH:mm–HH:mm"}
-                    a{"HH:mm–HH:mm"}
                     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"}
-                    a{"HH–HH v"}
                 }
                 M{
-                    M{"MM"}
+                    M{"MM–MM"}
                 }
                 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{
-                    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{
-                    M{"MM-d – MM-d"}
-                    d{"MM-d – d"}
+                    M{"MMM d – MMM d"}
+                    d{"MMM d–d"}
                 }
                 Md{
                     M{"MM-dd – MM-dd"}
-                    d{"MM-dd – dd"}
+                    d{"MM-dd – MM-dd"}
                 }
                 d{
                     d{"d–d"}
@@ -797,57 +962,55 @@ root{
                     y{"y–y"}
                 }
                 yM{
-                    M{"yyyy-MM – MM"}
-                    y{"yyyy-MM – yyyy-MM"}
+                    M{"y-MM – y-MM"}
+                    y{"y-MM – y-MM"}
                 }
                 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{"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{"yyyy-MM – MM"}
-                    y{"yyyy-MM – yyyy-MM"}
+                    M{"y MMM–MMM"}
+                    y{"y MMM – y MMM"}
                 }
                 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{"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{"yyyy-MM – MM"}
-                    y{"yyyy-MM – yyyy-MM"}
+                    M{"y MMMM–MMMM"}
+                    y{"y MMMM – y MMMM"}
                 }
                 yMMMd{
-                    M{"yyyy-MM-dd – MM-d"}
-                    d{"yyyy-MM-d – d"}
-                    y{"yyyy-MM-dd – yyyy-MM-dd"}
+                    M{"y MMM d – MMM d"}
+                    d{"y MMM d–d"}
+                    y{"y MMM d – y MMM d"}
                 }
                 yMd{
-                    M{"yyyy-MM-dd – MM-dd"}
-                    d{"yyyy-MM-dd – dd"}
-                    y{"yyyy-MM-dd – yyyy-MM-dd"}
+                    M{"y-MM-dd – y-MM-dd"}
+                    d{"y-MM-dd – y-MM-dd"}
+                    y{"y-MM-dd – y-MM-dd"}
                 }
             }
             monthNames{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/gregorian/monthNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/gregorian/monthNames/stand-alone/narrow"}
                     wide{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                        "8",
-                        "9",
-                        "10",
-                        "11",
-                        "12",
+                        "Month1",
+                        "Month2",
+                        "Month3",
+                        "Month4",
+                        "Month5",
+                        "Month6",
+                        "Month7",
+                        "Month8",
+                        "Month9",
+                        "Month10",
+                        "Month11",
+                        "Month12",
                     }
                 }
                 stand-alone{
@@ -894,9 +1057,9 @@ root{
         }
         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"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -905,27 +1068,11 @@ root{
                 narrow:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
                 wide:alias{"/LOCALE/calendar/hebrew/eras/abbreviated"}
             }
-            intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
+            intervalFormats:alias{"/LOCALE/calendar/generic/intervalFormats"}
             monthNames{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
-                    default{"wide"}
-                    narrow{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                        "8",
-                        "9",
-                        "10",
-                        "11",
-                        "12",
-                        "13",
-                    }
+                    narrow:alias{"/LOCALE/calendar/hebrew/monthNames/stand-alone/narrow"}
                     wide{
                         "Tishri",
                         "Heshvan",
@@ -945,7 +1092,21 @@ root{
                 }
                 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",
+                    }
                     wide:alias{"/LOCALE/calendar/hebrew/monthNames/format/wide"}
                 }
             }
@@ -953,9 +1114,9 @@ root{
         }
         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"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -964,12 +1125,10 @@ root{
                 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{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/indian/monthNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/indian/monthNames/stand-alone/narrow"}
                     wide{
                         "Chaitra",
@@ -1009,9 +1168,9 @@ root{
         }
         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"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -1020,9 +1179,8 @@ root{
                 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{
-                default{"format"}
                 format{
                     abbreviated{
                         "Muh.",
@@ -1038,7 +1196,6 @@ root{
                         "Dhuʻl-Q.",
                         "Dhuʻl-H.",
                     }
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/islamic/monthNames/stand-alone/narrow"}
                     wide{
                         "Muharram",
@@ -1089,62 +1246,9 @@ root{
         }
         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"}
-            }
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -1170,7 +1274,7 @@ root{
                     "Daidō (806-810)",
                     "Kōnin (810-824)",
                     "Tenchō (824-834)",
-                    "Shōwa (834-848)",
+                    "Jōwa (834-848)",
                     "Kajō (848-851)",
                     "Ninju (851-854)",
                     "Saiko (854-857)",
@@ -1309,11 +1413,11 @@ root{
                     "Kōkoku (1340-1346)",
                     "Shōhei (1346-1370)",
                     "Kentoku (1370-1372)",
-                    "BunchÅ© (1372-1375)",
+                    "BunchÅ« (1372-1375)",
                     "Tenju (1375-1379)",
                     "Kōryaku (1379-1381)",
                     "Kōwa (1381-1384)",
-                    "GenchÅ© (1384-1392)",
+                    "GenchÅ« (1384-1392)",
                     "Meitoku (1384-1387)",
                     "Kakei (1387-1389)",
                     "Kōō (1389-1390)",
@@ -1386,238 +1490,238 @@ root{
                     "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)",
+                    "Tempyō (729-749)",
+                    "Tempyō-kampō (749-749)",
+                    "Tempyō-shōhō (749-757)",
+                    "Tempyō-hōji (757-765)",
+                    "Temphō-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)",
+                    "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)",
+                    "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)",
                     "M",
                     "T",
                     "S",
@@ -1625,14 +1729,15 @@ root{
                 }
                 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"}
-            DateTimePatterns:alias{"/LOCALE/calendar/gregorian/DateTimePatterns"}
-            appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
-            availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -1641,12 +1746,10 @@ root{
                 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{
-                default{"format"}
                 format{
                     abbreviated:alias{"/LOCALE/calendar/persian/monthNames/format/wide"}
-                    default{"wide"}
                     narrow:alias{"/LOCALE/calendar/persian/monthNames/stand-alone/narrow"}
                     wide{
                         "Farvardin",
@@ -1686,62 +1789,9 @@ root{
         }
         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"}
-            }
+            DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"}
+            appendItems:alias{"/LOCALE/calendar/generic/appendItems"}
+            availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"}
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
@@ -1751,7 +1801,7 @@ root{
                 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"}
         }
@@ -1762,6 +1812,46 @@ root{
         quotationEnd{"”"}
         quotationStart{"“"}
     }
+    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"}
+        }
+    }
     layout{
         characters{"left-to-right"}
         lines{"top-to-bottom"}