X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/51004dcb01e06fef634b61be77ed73dd61cb6db9..ef6cf650f4a75c3f97de06b51fa104f2069b9ea2:/icuSources/data/locales/chr.txt?ds=sidebyside

diff --git a/icuSources/data/locales/chr.txt b/icuSources/data/locales/chr.txt
index a4000759..48b1679f 100755
--- a/icuSources/data/locales/chr.txt
+++ b/icuSources/data/locales/chr.txt
@@ -1,29 +1,24 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2013 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/main/chr.xml
 // *
 // ***************************************************************************
-/**
- *  ICU <specials> source: <path>/xml/main/chr.xml
- */
 chr{
     AuxExemplarCharacters{"[]"}
     ExemplarCharacters{
-        "[Ꭰ Ꭱ Ꭲ Ꭳ Ꭴ Ꭵ Ꭶ Ꭷ Ꭸ Ꭹ Ꭺ Ꭻ Ꭼ Ꭽ Ꭾ Ꭿ Ꮀ Ꮁ Ꮂ Ꮃ Ꮄ Ꮅ Ꮆ Ꮇ Ꮈ Ꮉ Ꮊ Ꮋ Ꮌ Ꮍ Ꮎ Ꮏ Ꮐ Ꮑ Ꮒ Ꮓ Ꮔ Ꮕ"
-        " Ꮖ Ꮗ Ꮘ Ꮙ Ꮚ Ꮛ Ꮜ Ꮝ Ꮞ Ꮟ Ꮠ Ꮡ Ꮢ Ꮣ Ꮤ Ꮥ Ꮦ Ꮧ Ꮨ Ꮩ Ꮪ Ꮫ Ꮬ Ꮭ Ꮮ Ꮯ Ꮰ Ꮱ Ꮲ Ꮳ Ꮴ Ꮵ Ꮶ Ꮷ Ꮸ Ꮹ Ꮺ Ꮻ"
-        " Ꮼ Ꮽ Ꮾ Ꮿ Ᏸ Ᏹ Ᏺ Ᏻ Ᏼ]"
+        "[ꭰ ꭱ ꭲ ꭳ ꭴ ꭵ ꭶ ꭷ ꭸ ꭹ ꭺ ꭻ ꭼ ꭽ ꭾ ꭿ ꮀ ꮁ ꮂ ꮃ ꮄ ꮅ ꮆ ꮇ ꮈ ꮉ ꮊ ꮋ ꮌ ꮍ ꮎ ꮏ ꮐ ꮑ ꮒ ꮓ ꮔ ꮕ"
+        " ꮖ ꮗ ꮘ ꮙ ꮚ ꮛ ꮜ ꮝ ꮞ ꮟ ꮠ ꮡ ꮢ ꮣ ꮤ ꮥ ꮦ ꮧ ꮨ ꮩ ꮪ ꮫ ꮬ ꮭ ꮮ ꮯ ꮰ ꮱ ꮲ ꮳ ꮴ ꮵ ꮶ ꮷ ꮸ ꮹ ꮺ ꮻ"
+        " ꮼ ꮽ ꮾ ꮿ ᏸ ᏹ ᏺ ᏻ ᏼ]"
     }
     ExemplarCharactersIndex{"[Ꭰ Ꭶ Ꭽ Ꮃ Ꮉ Ꮎ Ꮖ Ꮜ Ꮣ Ꮬ Ꮳ Ꮹ Ꮿ]"}
-    LocaleScript{
-        "Cher",
-    }
     NumberElements{
         latn{
             patterns{
-                currencyFormat{"¤#,##0.00;(¤#,##0.00)"}
+                accountingFormat{"¤#,##0.00;(¤#,##0.00)"}
+                currencyFormat{"¤#,##0.00"}
                 decimalFormat{"#,##0.###"}
                 percentFormat{"#,##0%"}
                 scientificFormat{"#E0"}
@@ -42,7 +37,7 @@ chr{
             }
         }
     }
-    Version{"2.0.82.45"}
+    Version{"2.1.23.7"}
     calendar{
         generic{
             DateTimePatterns{
@@ -53,7 +48,7 @@ chr{
                 "EEEE, MMMM d, y G",
                 "MMMM d, y G",
                 "MMM d, y G",
-                "M/d/yy GGGGG",
+                "M/d/y GGGGG",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
@@ -61,6 +56,10 @@ chr{
                 "{1} {0}",
             }
             availableFormats{
+                Gy{"y G"}
+                GyMMM{"MMM y G"}
+                GyMMMEd{"E, MMM d, y G"}
+                GyMMMd{"MMM d, y G"}
                 Hm{"H:mm"}
                 Hms{"H:mm:ss"}
                 MEd{"E, M/d"}
@@ -68,15 +67,17 @@ chr{
                 Md{"M/d"}
                 hm{"h:mm a"}
                 hms{"h:mm:ss a"}
-                yM{"M/y"}
-                yMEd{"E, M/d/y"}
-                yMMM{"MMM y"}
-                yMMMEd{"E, MMM d, y"}
-                yMMMM{"MMMM y"}
-                yMMMd{"MMM d, y"}
-                yMd{"M/d/y"}
-                yQQQ{"QQQ y"}
-                yQQQQ{"QQQQ y"}
+                y{"y G"}
+                yyyy{"y G"}
+                yyyyM{"M/y G"}
+                yyyyMEd{"E, M/d/y G"}
+                yyyyMMM{"MMM y G"}
+                yyyyMMMEd{"E, MMM d, y G"}
+                yyyyMMMM{"MMMM y G"}
+                yyyyMMMd{"MMM d, y G"}
+                yyyyMd{"M/d/y G"}
+                yyyyQQQ{"QQQ y G"}
+                yyyyQQQQ{"QQQQ y G"}
             }
             intervalFormats{
                 MEd{
@@ -96,36 +97,36 @@ chr{
                     d{"M/d – M/d"}
                 }
                 yM{
-                    M{"M/y – M/y"}
-                    y{"M/y – M/y"}
+                    M{"M/y – M/y G"}
+                    y{"M/y – M/y G"}
                 }
                 yMEd{
-                    M{"E, M/d/y – E, M/d/y"}
-                    d{"E, M/d/y – E, M/d/y"}
-                    y{"E, M/d/y – E, M/d/y"}
+                    M{"E, M/d/y – E, M/d/y G"}
+                    d{"E, M/d/y – E, M/d/y G"}
+                    y{"E, M/d/y – E, M/d/y G"}
                 }
                 yMMM{
-                    M{"MMM–MMM y"}
-                    y{"MMM y – MMM y"}
+                    M{"MMM–MMM y G"}
+                    y{"MMM y – MMM y G"}
                 }
                 yMMMEd{
-                    M{"E, MMM d – E, MMM d, y"}
-                    d{"E, MMM d – E, MMM d, y"}
-                    y{"E, MMM d, y – E, MMM d, y"}
+                    M{"E, MMM d – E, MMM d, y G"}
+                    d{"E, MMM d – E, MMM d, y G"}
+                    y{"E, MMM d, y – E, MMM d, y G"}
                 }
                 yMMMM{
-                    M{"MMMM–MMMM y"}
-                    y{"MMMM y – MMMM y"}
+                    M{"MMMM–MMMM y G"}
+                    y{"MMMM y – MMMM y G"}
                 }
                 yMMMd{
-                    M{"MMM d – MMM d, y"}
-                    d{"MMM d–d, y"}
-                    y{"MMM d, y – MMM d, y"}
+                    M{"MMM d – MMM d, y G"}
+                    d{"MMM d–d, y G"}
+                    y{"MMM d, y – MMM d, y G"}
                 }
                 yMd{
-                    M{"M/d/y – M/d/y"}
-                    d{"M/d/y – M/d/y"}
-                    y{"M/d/y – M/d/y"}
+                    M{"M/d/y – M/d/y G"}
+                    d{"M/d/y – M/d/y G"}
+                    y{"M/d/y – M/d/y G"}
                 }
             }
         }
@@ -134,6 +135,10 @@ chr{
                 "ᏌᎾᎴ",
                 "ᏒᎯᏱᎢᏗᏢ",
             }
+            AmPmMarkersAbbr{
+                "ᏌᎾᎴ",
+                "ᏒᎯᏱᎢᏗᏢ",
+            }
             DateTimePatterns{
                 "h:mm:ss a zzzz",
                 "h:mm:ss a z",
@@ -150,6 +155,10 @@ chr{
                 "{1} {0}",
             }
             availableFormats{
+                Gy{"y G"}
+                GyMMM{"MMM y G"}
+                GyMMMEd{"E, MMM d, y G"}
+                GyMMMd{"MMM d, y G"}
                 Hm{"H:mm"}
                 Hms{"H:mm:ss"}
                 MEd{"E, M/d"}
@@ -200,6 +209,29 @@ chr{
                     }
                 }
             }
+            dayPeriod{
+                format{
+                    abbreviated{
+                        afternoon1{"ᏒᎯᏱᎢᏗᏢ"}
+                        morning1{"ᏌᎾᎴ"}
+                        noon{"ᎢᎦ"}
+                    }
+                    wide{
+                        afternoon1{"ᏒᎯᏱᎢᏗᏢ"}
+                        morning1{"ᏌᎾᎴ"}
+                        noon{"ᎢᎦ"}
+                    }
+                }
+                stand-alone{
+                    wide{
+                        afternoon1{"ᏒᎯᏱᎢᏗᏢ"}
+                        am{"ᏌᎾᎴ"}
+                        morning1{"ᏌᎾᎴ"}
+                        noon{"ᎢᎦ"}
+                        pm{"ᏒᎯᏱᎢᏗᏢ"}
+                    }
+                }
+            }
             eras{
                 abbreviated{
                     "ᎤᏓᎷᎸ",
@@ -274,7 +306,7 @@ chr{
                         "ᏚᎵ",
                         "ᏚᏂ",
                         "ᏅᏓ",
-                        "ᎤᏍ",
+                        "ᎥᏍ",
                     }
                     wide{
                         "ᎤᏃᎸᏔᏅ",
@@ -288,7 +320,7 @@ chr{
                         "ᏚᎵᏍᏗ",
                         "ᏚᏂᏅᏗ",
                         "ᏅᏓᏕᏆ",
-                        "ᎤᏍᎩᏱ",
+                        "ᎥᏍᎩᏱ",
                     }
                 }
                 stand-alone{
@@ -304,7 +336,7 @@ chr{
                         "Ꮪ",
                         "Ꮪ",
                         "Ꮕ",
-                        "Ꭴ",
+                        "Ꭵ",
                     }
                 }
             }
@@ -357,34 +389,4 @@ chr{
         US{"ᎣᏂᏏ"}
         metric{"ᎺᏘᎩ"}
     }
-    units{
-        day{
-            one{"{0} ᏏᎦ"}
-            other{"{0} ᏧᏒᎯᏓ"}
-        }
-        hour{
-            one{"{0} ᏑᏣᎶᏓ"}
-            other{"{0} ᎢᏧᏣᎶᏓ"}
-        }
-        minute{
-            one{"{0} ᎢᏯᏔᏬᏍᏔᏅ"}
-            other{"{0} ᎢᏧᏔᏬᏍᏔᏅ"}
-        }
-        month{
-            one{"{0} ᏏᏅᏓ"}
-            other{"{0} ᎢᏯᏅᏓ"}
-        }
-        second{
-            one{"{0} ᎠᏎᏢ"}
-            other{"{0} ᏗᏎᏢ"}
-        }
-        week{
-            one{"{0} ᏒᎾᏙᏓᏆᏍᏗ"}
-            other{"{0} ᎢᏳᎾᏙᏓᏆᏍᏗ"}
-        }
-        year{
-            one{"{0} ᏑᏕᏘᏴᏓ"}
-            other{"{0} ᏧᏕᏘᏴᏓ"}
-        }
-    }
 }