X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/2ca993e82fb37b597a3c73ecd1586a139a6579c5..9663b57d33cc571e269bcfab3d9df43b149162db:/icuSources/data/locales/en_JP.txt?ds=sidebyside

diff --git a/icuSources/data/locales/en_JP.txt b/icuSources/data/locales/en_JP.txt
index 3e801f9b..284739a7 100755
--- a/icuSources/data/locales/en_JP.txt
+++ b/icuSources/data/locales/en_JP.txt
@@ -5,7 +5,6 @@
 // *
 // ***************************************************************************
 en_JP{
-    %%Parent{"en_001"}
     Version{"2.1.23.47"}
     calendar{
         chinese{
@@ -14,9 +13,9 @@ en_JP{
                 "H:mm:ss z",
                 "H:mm:ss",
                 "H:mm",
-                "r(U) MMMM d EEEE",
-                "r(U) MMMM d",
-                "r MMM d",
+                "EEEE, MMMM d, r(U)",
+                "MMMM d, r(U)",
+                "MMM d, r",
                 "r/MM/dd",
                 "{1} {0}",
                 "{1} {0}",
@@ -28,16 +27,16 @@ en_JP{
                 EHm{"E H:mm"}
                 EHms{"E H:mm:ss"}
                 Ed{"d E"}
-                Ehm{"E aK:mm"}
-                Ehms{"E aK:mm:ss"}
-                GyMMMEd{"r(U) MMM d E"}
-                GyMMMMd{"r(U) MMMM d"}
-                GyMMMd{"r MMM d"}
+                Ehm{"E K:mm a"}
+                Ehms{"E K:mm:ss a"}
+                GyMMMEd{"E, MMM d, r(U)"}
+                GyMMMMd{"MMMM d, r(U)"}
+                GyMMMd{"MMM d, r"}
                 H{"H"}
                 Hm{"H:mm"}
                 Hms{"H:mm:ss"}
                 MEd{"MM/dd E"}
-                MMMEd{"MMM d E"}
+                MMMEd{"E, MMM d"}
                 MMMMd{"MMMM d"}
                 MMMd{"MMM d"}
                 Md{"MM/dd"}
@@ -46,8 +45,8 @@ en_JP{
                 yMd{"r/MM/dd"}
                 yyyyM{"r/MM"}
                 yyyyMEd{"r/MM/dd E"}
-                yyyyMMMEd{"r(U) MMM d E"}
-                yyyyMMMd{"r MMM d"}
+                yyyyMMMEd{"E, MMM d, r(U)"}
+                yyyyMMMd{"MMM d, r"}
                 yyyyMd{"r/MM/dd"}
             }
         }
@@ -57,9 +56,9 @@ en_JP{
                 "H:mm:ss z",
                 "H:mm:ss",
                 "H:mm",
-                "G y MMMM d EEEE",
-                "G y MMMM d",
-                "G y MMM d",
+                "EEEE, MMMM d, y G",
+                "MMMM d, y G",
+                "MMM d, y G",
                 "GGGGG y/MM/dd",
                 "{1} {0}",
                 "{1} {0}",
@@ -68,67 +67,123 @@ en_JP{
                 "{1} {0}",
             }
             availableFormats{
+                E{"ccc"}
                 EHm{"E H:mm"}
                 EHms{"E H:mm:ss"}
                 Ed{"d E"}
-                Ehm{"E aK:mm"}
-                Ehms{"E aK:mm:ss"}
-                GyMMMEd{"G y MMM d E"}
-                GyMMMd{"G y MMM d"}
+                Ehm{"E K:mm a"}
+                Ehms{"E K:mm:ss a"}
+                Gy{"y G"}
+                GyMMM{"MMM y G"}
+                GyMMMEd{"E, MMM d, y G"}
+                GyMMMd{"MMM d, y G"}
                 H{"H"}
                 Hm{"H:mm"}
                 Hms{"H:mm:ss"}
+                M{"L"}
                 MEd{"MM/dd E"}
-                MMMEd{"MMM d E"}
+                MMM{"LLL"}
+                MMMEd{"E, MMM d"}
                 MMMMd{"MMMM d"}
                 MMMd{"MMM d"}
                 Md{"MM/dd"}
+                d{"d"}
+                h{"h a"}
+                hm{"h:mm a"}
+                hms{"h:mm:ss a"}
+                ms{"mm:ss"}
+                y{"y G"}
+                yyyy{"y G"}
                 yyyyM{"GGGGG y/MM"}
                 yyyyMEd{"GGGGG y/MM/dd E"}
-                yyyyMMMEd{"G y MMM d E"}
-                yyyyMMMd{"G y MMM d"}
+                yyyyMMM{"MMM y G"}
+                yyyyMMMEd{"E, MMM d, y G"}
+                yyyyMMMM{"MMMM y G"}
+                yyyyMMMd{"MMM d, y G"}
                 yyyyMd{"GGGGG y/MM/dd"}
             }
             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{"M – M"}
+                }
                 MEd{
-                    M{"MM/dd E – MM/dd E"}
-                    d{"MM/dd E – MM/dd E"}
+                    M{"MM/dd E – MM/dd E"}
+                    d{"MM/dd E – MM/dd E"}
                 }
                 MMMEd{
-                    M{"MMM d E – MMM d E"}
-                    d{"MMM d E – d E"}
+                    M{"E, MMM d – E, MMM d"}
+                    d{"E, MMM d – E, MMM d"}
                 }
                 MMMd{
-                    M{"MMM d – MMM d"}
-                    d{"MMM d – d"}
+                    M{"MMM d – MMM d"}
+                    d{"MMM d – d"}
                 }
                 Md{
-                    M{"MM/dd – MM/dd"}
-                    d{"MM/dd – MM/dd"}
+                    M{"MM/dd – MM/dd"}
+                    d{"MM/dd – MM/dd"}
+                }
+                d{
+                    d{"d – d"}
+                }
+                fallback{"{0} – {1}"}
+                h{
+                    a{"h a – h a"}
+                    h{"h – h a"}
+                }
+                hm{
+                    a{"h:mm a – h:mm a"}
+                    h{"h:mm – h:mm a"}
+                    m{"h:mm – h:mm a"}
+                }
+                hmv{
+                    a{"h:mm a – h:mm a v"}
+                    h{"h:mm – h:mm a v"}
+                    m{"h:mm – h:mm a v"}
+                }
+                hv{
+                    a{"h a – h a v"}
+                    h{"h – h a v"}
+                }
+                y{
+                    y{"y – y G"}
                 }
                 yM{
-                    M{"GGGGG y/MM – y/MM"}
-                    y{"GGGGG y/MM – y/MM"}
+                    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"}
+                    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"}
                 }
                 yMMMEd{
-                    M{"G y MMM d E – MMM d E"}
-                    d{"G y MMM d E – d E"}
-                    y{"G y MMM d E – y MMM d E"}
+                    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"}
                 }
                 yMMMd{
-                    M{"G y MMM d – MMM d"}
-                    d{"G y MMM d – d"}
-                    y{"G y MMM d – y MMM d"}
+                    M{"MMM d – MMM d, y G"}
+                    d{"MMM d – d, y G"}
+                    y{"MMM d, y – MMM d, y G"}
                 }
                 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"}
+                    M{"GGGGG y/MM/dd – y/MM/dd"}
+                    d{"GGGGG y/MM/dd – y/MM/dd"}
+                    y{"GGGGG y/MM/dd – y/MM/dd"}
                 }
             }
         }
@@ -138,9 +193,9 @@ en_JP{
                 "H:mm:ss z",
                 "H:mm:ss",
                 "H:mm",
-                "y MMMM d EEEE",
-                "y MMMM d",
-                "y MMM d",
+                "EEEE, MMMM d, y",
+                "MMMM d, y",
+                "MMM d, y",
                 "y/MM/dd",
                 "{1} {0}",
                 "{1} {0}",
@@ -149,68 +204,138 @@ en_JP{
                 "{1} {0}",
             }
             availableFormats{
+                E{"ccc"}
                 EHm{"E H:mm"}
                 EHms{"E H:mm:ss"}
                 Ed{"d E"}
-                Ehm{"E aK:mm"}
-                Ehms{"E aK:mm:ss"}
-                GyMMMEd{"G y MMM d E"}
-                GyMMMd{"G y MMM d"}
+                Ehm{"E K:mm a"}
+                Ehms{"E K:mm:ss a"}
+                Gy{"y G"}
+                GyMMM{"MMM y G"}
+                GyMMMEd{"E, MMM d, y G"}
+                GyMMMd{"MMM d, y G"}
                 H{"H"}
                 Hm{"H:mm"}
                 Hms{"H:mm:ss"}
+                Hmsv{"HH:mm:ss v"}
+                Hmv{"HH:mm v"}
+                M{"L"}
                 MEd{"MM/dd E"}
-                MMMEd{"MMM d E"}
+                MMM{"LLL"}
+                MMMEd{"E, MMM d"}
                 MMMMd{"MMMM d"}
                 MMMd{"MMM d"}
                 MMdd{"MM/dd"}
                 Md{"MM/dd"}
+                d{"d"}
+                h{"h a"}
+                hm{"h:mm a"}
+                hms{"h:mm:ss a"}
+                hmsv{"h:mm:ss a v"}
+                hmv{"h:mm a v"}
+                ms{"mm:ss"}
+                y{"y"}
                 yM{"y/MM"}
                 yMEd{"y/MM/dd E"}
-                yMMMEd{"y MMM d E"}
-                yMMMd{"y MMM d"}
+                yMMM{"MMM y"}
+                yMMMEd{"E, MMM d, y"}
+                yMMMM{"MMMM y"}
+                yMMMd{"MMM d, y"}
                 yMd{"y/MM/dd"}
             }
             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{"M – M"}
+                }
                 MEd{
-                    M{"MM/dd E – MM/dd E"}
-                    d{"MM/dd E – MM/dd E"}
+                    M{"MM/dd E – MM/dd E"}
+                    d{"MM/dd E – MM/dd E"}
+                }
+                MMM{
+                    M{"MMM – MMM"}
                 }
                 MMMEd{
-                    M{"MMM d E – MMM d E"}
-                    d{"MMM d E – d E"}
+                    M{"E, MMM d – E, MMM d"}
+                    d{"E, MMM d – E, MMM d"}
                 }
                 MMMd{
-                    M{"MMM d – MMM d"}
-                    d{"MMM d – d"}
+                    M{"MMM d – MMM d"}
+                    d{"MMM d – d"}
                 }
                 Md{
-                    M{"MM/dd – MM/dd"}
-                    d{"MM/dd – MM/dd"}
+                    M{"MM/dd – MM/dd"}
+                    d{"MM/dd – MM/dd"}
+                }
+                d{
+                    d{"d – d"}
+                }
+                fallback{"{0} – {1}"}
+                h{
+                    a{"h a – h a"}
+                    h{"h – h a"}
+                }
+                hm{
+                    a{"h:mm a – h:mm a"}
+                    h{"h:mm – h:mm a"}
+                    m{"h:mm – h:mm a"}
+                }
+                hmv{
+                    a{"h:mm a – h:mm a v"}
+                    h{"h:mm – h:mm a v"}
+                    m{"h:mm – h:mm a v"}
+                }
+                hv{
+                    a{"h a – h a v"}
+                    h{"h – h a v"}
+                }
+                y{
+                    y{"y – y"}
                 }
                 yM{
-                    M{"y/MM – y/MM"}
-                    y{"y/MM – y/MM"}
+                    M{"y/MM – y/MM"}
+                    y{"y/MM – y/MM"}
                 }
                 yMEd{
-                    M{"y/MM/dd E – y/MM/dd E"}
-                    d{"y/MM/dd E – y/MM/dd E"}
-                    y{"y/MM/dd E – y/MM/dd E"}
+                    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{"MMM – MMM y"}
+                    y{"MMM y – MMM y"}
                 }
                 yMMMEd{
-                    M{"y MMM d E – MMM d E"}
-                    d{"y MMM d E – d E"}
-                    y{"y MMM d E – y MMM d E"}
+                    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"}
+                }
+                yMMMM{
+                    M{"MMMM – MMMM y"}
+                    y{"MMMM y – MMMM y"}
                 }
                 yMMMd{
-                    M{"y MMM d – MMM d"}
-                    d{"y MMM d – d"}
-                    y{"y MMM d – y MMM d"}
+                    M{"MMM d – MMM d, y"}
+                    d{"MMM d – d, y"}
+                    y{"MMM d, y – MMM d, y"}
                 }
                 yMd{
-                    M{"y/MM/dd – y/MM/dd"}
-                    d{"y/MM/dd – y/MM/dd"}
-                    y{"y/MM/dd – y/MM/dd"}
+                    M{"y/MM/dd – y/MM/dd"}
+                    d{"y/MM/dd – y/MM/dd"}
+                    y{"y/MM/dd – y/MM/dd"}
                 }
             }
         }