X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..3bb97ae2c034620e98ae804f2ed484db37b2e461:/icuSources/data/locales/en_GB.txt

diff --git a/icuSources/data/locales/en_GB.txt b/icuSources/data/locales/en_GB.txt
index 5c0ab7fb..15d25686 100644
--- a/icuSources/data/locales/en_GB.txt
+++ b/icuSources/data/locales/en_GB.txt
@@ -1,52 +1,79 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2010 International Business Machines
-// * Corporation and others.  All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/common/main/en_GB.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 en_GB{
-    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]"}
-    NumberElements{
-        latn{
-            patterns{
-                currencyFormat{"¤#,##0.00"}
-            }
-        }
-    }
-    Version{"2.0.51.59"}
+    %%Parent{"en_001"}
+    Version{"2.1.31.33"}
     calendar{
-        buddhist{
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, d MMMM y G",
-                "d MMMM y G",
-                "d MMM y G",
-                "dd/MM/y G",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
+        chinese{
+            availableFormats{
+                Ed{"E d"}
+                GyMMMEd{"E, d MMM r(U)"}
+                GyMMMd{"d MMM r"}
+                M{"LL"}
+                MEd{"E dd/MM"}
+                MMMEd{"E d MMM"}
+                MMMMd{"d MMMM"}
+                MMMd{"d MMM"}
+                Md{"dd/MM"}
+                UMMMd{"d MMM U"}
+                UMd{"dd/MM/U"}
+                yMd{"dd/MM/r"}
+                yyyyM{"MM/r"}
+                yyyyMEd{"E, dd/MM/r"}
+                yyyyMMMEd{"E, d MMM r(U)"}
+                yyyyMMMd{"d MMM r"}
+                yyyyMd{"dd/MM/r"}
             }
+            intervalFormats{
+                MMMd{
+                    M{"d MMM – d MMM"}
+                    d{"d–d MMM"}
+                }
+                yMMMd{
+                    M{"d MMM – d MMM U"}
+                    d{"d–d MMM U"}
+                    y{"d MMM U – d MMM U"}
+                }
+            }
+        }
+        generic{
             availableFormats{
-                MEd{"E, d/M"}
+                Ed{"E d"}
+                GyMMMEd{"E, d MMM y G"}
+                GyMMMd{"d MMM y G"}
+                M{"LL"}
+                MEd{"E dd/MM"}
                 MMMEd{"E d MMM"}
                 MMMMd{"d MMMM"}
-                MMdd{"dd/MM"}
-                Md{"d/M"}
-                yMEd{"EEE, d/M/y G"}
-                yyMMM{"MMM y G"}
-                yyyyMM{"MM/y G"}
-                yyyyMMMM{"MMMM y G"}
-                yyyyMd{"d/M/y G"}
+                MMMd{"d MMM"}
+                Md{"dd/MM"}
+                yyyyM{"MM/y GGGGG"}
+                yyyyMEd{"E, dd/MM/y GGGGG"}
+                yyyyMMMEd{"E, d MMM y G"}
+                yyyyMMMd{"d MMM y G"}
+                yyyyMd{"dd/MM/y GGGGG"}
+            }
+            intervalFormats{
+                MMMd{
+                    M{"d MMM – d MMM"}
+                    d{"d–d MMM"}
+                }
+                yMMMd{
+                    M{"d MMM – d MMM y G"}
+                    d{"d–d MMM y G"}
+                    y{"d MMM y – d MMM y G"}
+                }
             }
         }
         gregorian{
+            AmPmMarkers{
+                "am",
+                "pm",
+            }
+            AmPmMarkersAbbr{
+                "am",
+                "pm",
+            }
             DateTimePatterns{
                 "HH:mm:ss zzzz",
                 "HH:mm:ss z",
@@ -55,254 +82,112 @@ en_GB{
                 "EEEE, d MMMM y",
                 "d MMMM y",
                 "d MMM y",
-                "dd/MM/yyyy",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
+                "dd/MM/y",
+                "{1}, {0}",
+                "{1} 'at' {0}",
+                "{1} 'at' {0}",
+                "{1} 'at' {0}",
+                "{1}, {0}",
             }
             availableFormats{
-                MEd{"E, d/M"}
+                GyMMMEd{"E, d MMM y G"}
+                GyMMMd{"d MMM y G"}
+                MEd{"E dd/MM"}
                 MMMEd{"E d MMM"}
                 MMMMd{"d MMMM"}
+                MMMd{"d MMM"}
                 MMdd{"dd/MM"}
-                Md{"d/M"}
-                yMEd{"EEE, d/M/yyyy"}
-                yyMMM{"MMM yy"}
-                yyyyMM{"MM/yyyy"}
-                yyyyMMMM{"MMMM y"}
+                Md{"dd/MM"}
+                yM{"MM/y"}
+                yMEd{"E, dd/MM/y"}
+                yMMMEd{"E, d MMM y"}
+                yMMMd{"d MMM y"}
+                yMd{"dd/MM/y"}
+            }
+            dayPeriod{
+                stand-alone{
+                    abbreviated{
+                        am{"am"}
+                        pm{"pm"}
+                    }
+                    wide{
+                        am{"am"}
+                        pm{"pm"}
+                    }
+                }
             }
             intervalFormats{
+                H{
+                    H{"HH–HH"}
+                }
                 Hm{
-                    H{"HH:mm-HH:mm"}
-                    m{"HH:mm-HH:mm"}
+                    H{"HH:mm–HH:mm"}
+                    m{"HH:mm–HH:mm"}
                 }
                 Hmv{
-                    H{"HH:mm-HH:mm v"}
-                    m{"HH:mm-HH:mm v"}
-                }
-                M{
-                    M{"M-M"}
+                    H{"HH:mm–HH:mm v"}
+                    m{"HH:mm–HH:mm v"}
                 }
-                MEd{
-                    M{"E, dd/MM - E, dd/MM"}
-                    d{"E, dd/MM - E, dd/MM"}
+                Hv{
+                    H{"HH–HH v"}
                 }
-                MMM{
-                    M{"MMM-MMM"}
-                }
-                MMMEd{
-                    M{"E, d MMM - E, d MMM"}
-                    d{"E, d - E, d MMM"}
+                M{
+                    M{"M–M"}
                 }
                 MMMd{
-                    M{"d MMM - d MMM"}
-                    d{"d-d MMM"}
-                }
-                Md{
-                    M{"dd/MM - dd/MM"}
-                    d{"dd/MM - dd/MM"}
+                    M{"d MMM – d MMM"}
+                    d{"d–d MMM"}
                 }
                 d{
-                    d{"d-d"}
+                    d{"d–d"}
+                }
+                h{
+                    a{"h a – h a"}
+                    h{"h–h a"}
                 }
-                fallback{"{0} - {1}"}
                 hm{
-                    h{"h:mm-h:mm a"}
-                    m{"h:mm-h:mm a"}
+                    a{"h:mm a – h:mm a"}
+                    h{"h:mm–h:mm a"}
+                    m{"h:mm–h:mm a"}
                 }
                 hmv{
-                    h{"h:mm-h:mm a v"}
-                    m{"h:mm-h:mm a v"}
-                }
-                y{
-                    y{"y-y"}
-                }
-                yM{
-                    M{"MM/yyyy - MM/yyyy"}
-                    y{"MM/yyyy - MM/yyyy"}
-                }
-                yMEd{
-                    M{"E, dd/MM/yyyy - E, dd/MM/yyyy"}
-                    d{"E, dd/MM/yyyy - E, dd/MM/yyyy"}
-                    y{"E, dd/MM/yyyy - E, dd/MM/yyyy"}
+                    a{"h:mm a – h:mm a v"}
+                    h{"h:mm–h:mm a v"}
+                    m{"h:mm–h:mm a v"}
                 }
-                yMMM{
-                    M{"MMM-MMM y"}
-                    y{"MMM y - MMM y"}
+                hv{
+                    a{"h a – h a v"}
+                    h{"h–h a v"}
                 }
-                yMMMEd{
-                    M{"E, d MMM - E, d MMM y"}
-                    d{"E, d - E, d MMM y"}
-                    y{"E, d MMM y - E, d MMM y"}
+                y{
+                    y{"y–y"}
                 }
                 yMMMd{
-                    M{"d MMM - d MMM y"}
-                    d{"d-d MMM y"}
-                    y{"d MMM y - d MMM y"}
-                }
-                yMd{
-                    M{"dd/MM/yyyy - dd/MM/yyyy"}
-                    d{"dd/MM/yyyy - dd/MM/yyyy"}
-                    y{"dd/MM/yyyy - dd/MM/yyyy"}
+                    M{"d MMM – d MMM y"}
+                    d{"d–d MMM y"}
+                    y{"d MMM y – d MMM y"}
                 }
             }
         }
         islamic{
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, d MMMM y G",
-                "d MMMM y G",
-                "d MMM y G",
-                "dd/MM/y G",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-            }
             availableFormats{
-                MEd{"E, d/M"}
+                MEd{"E dd/MM"}
                 MMMEd{"E d MMM"}
-                MMMMd{"d MMMM"}
-                MMdd{"dd/MM"}
-                Md{"d/M"}
-                yyMMM{"MMM y G"}
-                yyyyMEd{"EEE, d/M/y G"}
-                yyyyMM{"MM/y G"}
-                yyyyMMM{"MMM y G"}
-                yyyyMMMM{"MMMM y G"}
-                yyyyMd{"d/M/y G"}
-            }
-            eras{
-                abbreviated{
-                    "AH",
-                }
-                narrow:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
-                wide:alias{"/LOCALE/calendar/islamic/eras/abbreviated"}
-            }
-            monthNames{
-                default{"format"}
-                format{
-                    abbreviated{
-                        "Muh.",
-                        "Saf.",
-                        "Rab. I",
-                        "Rab. II",
-                        "Jum. I",
-                        "Jum. II",
-                        "Raj.",
-                        "Sha.",
-                        "Ram.",
-                        "Shaw.",
-                        "Dhuʻl-Q.",
-                        "Dhuʻl-H.",
-                    }
-                    default{"wide"}
-                    narrow:alias{"/LOCALE/calendar/islamic/monthNames/stand-alone/narrow"}
-                    wide{
-                        "Muharram",
-                        "Safar",
-                        "RabiÊ» I",
-                        "RabiÊ» II",
-                        "Jumada I",
-                        "Jumada II",
-                        "Rajab",
-                        "Shaʻban",
-                        "Ramadan",
-                        "Shawwal",
-                        "Dhuʻl-Qiʻdah",
-                        "Dhuʻl-Hijjah",
-                    }
-                }
-                stand-alone{
-                    abbreviated:alias{"/LOCALE/calendar/islamic/monthNames/format/abbreviated"}
-                    narrow{
-                        "1",
-                        "2",
-                        "3",
-                        "4",
-                        "5",
-                        "6",
-                        "7",
-                        "8",
-                        "9",
-                        "10",
-                        "11",
-                        "12",
-                    }
-                    wide:alias{"/LOCALE/calendar/islamic/monthNames/format/wide"}
-                }
             }
         }
-        japanese{
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, d MMMM y G",
-                "d MMMM y G",
-                "d MMM y G",
-                "dd/MM/y G",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-            }
-            availableFormats{
-                MEd{"E, d/M"}
-                MMMEd{"E d MMM"}
-                MMMMd{"d MMMM"}
-                MMdd{"dd/MM"}
-                Md{"d/M"}
-                yyMMM{"MMM y G"}
-                yyyyMEd{"EEE, d/M/y G"}
-                yyyyMM{"MM/y G"}
-                yyyyMMM{"MMM y G"}
-                yyyyMMMM{"MMMM y G"}
-            }
+    }
+    listPattern{
+        standard{
+            2{"{0} and {1}"}
+            end{"{0} and {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
         }
-        roc{
-            DateTimePatterns{
-                "HH:mm:ss zzzz",
-                "HH:mm:ss z",
-                "HH:mm:ss",
-                "HH:mm",
-                "EEEE, d MMMM y G",
-                "d MMMM y G",
-                "d MMM y G",
-                "dd/MM/y G",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-                "{1} {0}",
-            }
-            availableFormats{
-                MEd{"E, d/M"}
-                MMMEd{"E d MMM"}
-                MMMMd{"d MMMM"}
-                MMdd{"dd/MM"}
-                Md{"d/M"}
-                yyMMM{"MMM y G"}
-                yyyyMEd{"EEE, d/M/y G"}
-                yyyyMM{"MM/y G"}
-                yyyyMMM{"MMM y G"}
-                yyyyMMMM{"MMMM y G"}
-                yyyyMd{"d/M/y G"}
-            }
+        standard-short{
+            2{"{0} and {1}"}
+            end{"{0} and {1}"}
+            middle{"{0}, {1}"}
+            start{"{0}, {1}"}
         }
     }
-    delimiters{
-        alternateQuotationEnd{"”"}
-        alternateQuotationStart{"“"}
-        quotationEnd{"’"}
-        quotationStart{"‘"}
-    }
 }