Index: source/data/locales/en_GB.txt |
diff --git a/source/data/locales/en_GB.txt b/source/data/locales/en_GB.txt |
index f701fc3b602c18f92b80dce6d84506fb57c924dd..a4f64fa4a181d308aab455f6d2ca8abbfcb8eeb8 100644 |
--- a/source/data/locales/en_GB.txt |
+++ b/source/data/locales/en_GB.txt |
@@ -1,6 +1,6 @@ |
// *************************************************************************** |
// * |
-// * Copyright (C) 2014 International Business Machines |
+// * Copyright (C) 2015 International Business Machines |
// * Corporation and others. All Rights Reserved. |
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter |
// * Source File: <path>/common/main/en_GB.xml |
@@ -8,314 +8,17 @@ |
// *************************************************************************** |
en_GB{ |
%%Parent{"en_001"} |
- Ellipsis{ |
- final{"{0}…"} |
- initial{"…{0}"} |
- medial{"{0}… {1}"} |
- word-final{"{0} …"} |
- word-initial{"… {0}"} |
- word-medial{"{0} … {1}"} |
- } |
- MoreInformation{"?"} |
- NumberElements{ |
- default{"latn"} |
- latn{ |
- miscPatterns{ |
- range{"{0}–{1}"} |
- } |
- symbols{ |
- timeSeparator{":"} |
- } |
- } |
- minimumGroupingDigits{"1"} |
- native{"latn"} |
- } |
- Version{"2.1.8.19"} |
+ Version{"2.1.19.79"} |
calendar{ |
- chinese{ |
- DateTimePatterns{ |
- "HH:mm:ss zzzz", |
- "HH:mm:ss z", |
- "HH:mm:ss", |
- "HH:mm", |
- "EEEE, d MMMM U", |
- "d MMMM U", |
- "d MMM U", |
- "dd/MM/yy", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- } |
- availableFormats{ |
- Ed{"E d"} |
- GyMMMEd{"E, d MMM U"} |
- GyMMMd{"d MMM U"} |
- M{"LL"} |
- MEd{"E dd/MM"} |
- MMMEd{"E d MMM"} |
- MMMMd{"d MMMM"} |
- MMMd{"d MMM"} |
- Md{"dd/MM"} |
- yMd{"dd/MM/y"} |
- yyyyM{"MM/y"} |
- yyyyMEd{"E, dd/MM/y"} |
- yyyyMMMEd{"E, d MMM U"} |
- yyyyMMMM{"MMMM U"} |
- yyyyMMMd{"d MMM U"} |
- yyyyMd{"dd/MM/y"} |
- } |
- 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{"E dd/MM – E dd/MM"} |
- d{"E dd/MM – E dd/MM"} |
- } |
- MMM{ |
- M{"MMM–MMM"} |
- } |
- MMMEd{ |
- M{"E d MMM – E d MMM"} |
- d{"E d – E d MMM"} |
- } |
- MMMd{ |
- M{"d MMM – d MMM"} |
- d{"d–d MMM"} |
- } |
- Md{ |
- M{"dd/MM – dd/MM"} |
- d{"dd/MM – dd/MM"} |
- } |
- d{ |
- d{"d–d"} |
- } |
- h{ |
- h{"h–h a"} |
- } |
- hm{ |
- 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"} |
- } |
- hv{ |
- h{"h–h a v"} |
- } |
- y{ |
- y{"U-U"} |
- } |
- yM{ |
- M{"MM/y – MM/y"} |
- y{"MM/y – MM/y"} |
- } |
- yMEd{ |
- M{"E, dd/MM/y – E, dd/MM/y"} |
- d{"E, dd/MM/y – E, dd/MM/y"} |
- y{"E, dd/MM/y – E, dd/MM/y"} |
- } |
- yMMM{ |
- M{"MMM–MMM U"} |
- } |
- yMMMEd{ |
- M{"E, d MMM – E, d MMM U"} |
- d{"E, d – E, d MMM U"} |
- y{"E, d MMM U – E, d MMM U"} |
- } |
- yMMMM{ |
- M{"MMMM–MMMM U"} |
- } |
- yMMMd{ |
- M{"d MMM – d MMM U"} |
- d{"d–d MMM U"} |
- y{"d MMM U – d MMM U"} |
- } |
- yMd{ |
- M{"dd/MM/y – dd/MM/y"} |
- d{"dd/MM/y – dd/MM/y"} |
- y{"dd/MM/y – dd/MM/y"} |
- } |
- } |
- monthNames{ |
- format{ |
- narrow{ |
- "1", |
- "2", |
- "3", |
- "4", |
- "5", |
- "6", |
- "7", |
- "8", |
- "9", |
- "10", |
- "11", |
- "12", |
- } |
- } |
- stand-alone{ |
- narrow{ |
- "1", |
- "2", |
- "3", |
- "4", |
- "5", |
- "6", |
- "7", |
- "8", |
- "9", |
- "10", |
- "11", |
- "12", |
- } |
- } |
- } |
- } |
- generic{ |
- 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 GGGGG", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- } |
- availableFormats{ |
- 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"} |
- MMMd{"d MMM"} |
- Md{"dd/MM"} |
- yyyyM{"MM/y GGGGG"} |
- yyyyMEd{"E, dd/MM/y GGGGG"} |
- yyyyMMMEd{"E, d MMM y G"} |
- yyyyMMMM{"MMMM y G"} |
- yyyyMMMd{"d MMM y G"} |
- yyyyMd{"dd/MM/y GGGGG"} |
- } |
- 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{"E dd/MM – E dd/MM"} |
- d{"E dd/MM – E dd/MM"} |
- } |
- MMM{ |
- M{"MMM–MMM"} |
- } |
- MMMEd{ |
- M{"E d MMM – E d MMM"} |
- d{"E d – E d MMM"} |
- } |
- MMMd{ |
- M{"d MMM – d MMM"} |
- d{"d–d MMM"} |
- } |
- Md{ |
- M{"dd/MM – dd/MM"} |
- d{"dd/MM – dd/MM"} |
- } |
- d{ |
- d{"d–d"} |
- } |
- h{ |
- h{"h–h a"} |
- } |
- hm{ |
- 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"} |
- } |
- hv{ |
- h{"h–h a v"} |
- } |
- y{ |
- y{"y-y G"} |
- } |
- yM{ |
- M{"MM/y – MM/y GGGGG"} |
- y{"MM/y – MM/y GGGGG"} |
- } |
- yMEd{ |
- M{"E, dd/MM/y – E, dd/MM/y GGGGG"} |
- d{"E, dd/MM/y – E, dd/MM/y GGGGG"} |
- y{"E, dd/MM/y – E, dd/MM/y GGGGG"} |
- } |
- yMMM{ |
- M{"MMM–MMM y G"} |
- } |
- yMMMEd{ |
- M{"E, d MMM – E, d MMM y G"} |
- d{"E, d – E, d MMM y G"} |
- y{"E, d MMM y – E, d MMM y G"} |
- } |
- yMMMM{ |
- M{"MMMM–MMMM y G"} |
- } |
- yMMMd{ |
- M{"d MMM – d MMM y G"} |
- d{"d–d MMM y G"} |
- y{"d MMM y – d MMM y G"} |
- } |
- yMd{ |
- M{"dd/MM/y – dd/MM/y GGGGG"} |
- d{"dd/MM/y – dd/MM/y GGGGG"} |
- y{"dd/MM/y – dd/MM/y GGGGG"} |
- } |
- } |
- } |
gregorian{ |
AmPmMarkers{ |
"am", |
"pm", |
} |
+ AmPmMarkersAbbr{ |
+ "am", |
+ "pm", |
+ } |
DateTimePatterns{ |
"HH:mm:ss zzzz", |
"HH:mm:ss z", |
@@ -331,466 +34,204 @@ en_GB{ |
"{1}, {0}", |
"{1}, {0}", |
} |
- availableFormats{ |
- 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{"dd/MM"} |
- yM{"MM/y"} |
- yMEd{"E, dd/MM/y"} |
- yMMMEd{"E, d MMM y"} |
- yMMMM{"MMMM y"} |
- yMMMd{"d MMM y"} |
- yMd{"dd/MM/y"} |
- } |
- 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{"E dd/MM – E dd/MM"} |
- d{"E dd/MM – E dd/MM"} |
- } |
- MMM{ |
- M{"MMM–MMM"} |
- } |
- MMMEd{ |
- M{"E d MMM – E d MMM"} |
- d{"E d – E d MMM"} |
- } |
- MMMd{ |
- M{"d MMM – d MMM"} |
- d{"d–d MMM"} |
- } |
- Md{ |
- M{"dd/MM – dd/MM"} |
- d{"dd/MM – dd/MM"} |
- } |
- d{ |
- d{"d–d"} |
- } |
- h{ |
- 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{ |
- h{"h:mm–h:mm a v"} |
- m{"h:mm–h:mm a v"} |
- } |
- hv{ |
- h{"h–h a v"} |
- } |
- y{ |
- y{"y-y"} |
- } |
- yM{ |
- M{"MM/y – MM/y"} |
- y{"MM/y – MM/y"} |
- } |
- yMEd{ |
- M{"E, dd/MM/y – E, dd/MM/y"} |
- d{"E, dd/MM/y – E, dd/MM/y"} |
- y{"E, dd/MM/y – E, dd/MM/y"} |
- } |
- yMMM{ |
- M{"MMM–MMM y"} |
- } |
- 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"} |
- } |
- yMMMM{ |
- M{"MMMM–MMMM y"} |
- } |
- yMMMd{ |
- M{"d MMM – d MMM y"} |
- d{"d–d MMM y"} |
- y{"d MMM y – d MMM y"} |
- } |
- yMd{ |
- M{"dd/MM/y – dd/MM/y"} |
- d{"dd/MM/y – dd/MM/y"} |
- y{"dd/MM/y – dd/MM/y"} |
- } |
- } |
- } |
- indian{ |
- eras{ |
- abbreviated{ |
- "SAKA", |
- } |
- } |
- monthNames{ |
+ dayPeriod{ |
format{ |
abbreviated{ |
- "Chaitra", |
- "Vaisakha", |
- "Jyaistha", |
- "Asadha", |
- "Sravana", |
- "Bhadra", |
- "Asvina", |
- "Kartika", |
- "Agrahayana", |
- "Pausa", |
- "Magha", |
- "Phalguna", |
+ noon{"noon"} |
} |
narrow{ |
- "1", |
- "2", |
- "3", |
- "4", |
- "5", |
- "6", |
- "7", |
- "8", |
- "9", |
- "10", |
- "11", |
- "12", |
+ noon{"n"} |
} |
wide{ |
- "Chaitra", |
- "Vaisakha", |
- "Jyaistha", |
- "Asadha", |
- "Sravana", |
- "Bhadra", |
- "Asvina", |
- "Kartika", |
- "Agrahayana", |
- "Pausa", |
- "Magha", |
- "Phalguna", |
+ noon{"noon"} |
} |
} |
stand-alone{ |
- abbreviated{ |
- "Chaitra", |
- "Vaisakha", |
- "Jyaistha", |
- "Asadha", |
- "Sravana", |
- "Bhadra", |
- "Asvina", |
- "Kartika", |
- "Agrahayana", |
- "Pausa", |
- "Magha", |
- "Phalguna", |
- } |
narrow{ |
- "1", |
- "2", |
- "3", |
- "4", |
- "5", |
- "6", |
- "7", |
- "8", |
- "9", |
- "10", |
- "11", |
- "12", |
+ am{"a"} |
+ noon{"n"} |
+ pm{"p"} |
} |
wide{ |
- "Chaitra", |
- "Vaisakha", |
- "Jyaistha", |
- "Asadha", |
- "Sravana", |
- "Bhadra", |
- "Asvina", |
- "Kartika", |
- "Agrahayana", |
- "Pausa", |
- "Magha", |
- "Phalguna", |
+ am{"am"} |
+ pm{"pm"} |
} |
} |
} |
} |
- 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 GGGGG", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- } |
- availableFormats{ |
- 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"} |
- MMMd{"d MMM"} |
- Md{"dd/MM"} |
- yyyyM{"MM/y GGGGG"} |
- yyyyMEd{"E, dd/MM/y GGGGG"} |
- yyyyMMMEd{"E, d MMM y G"} |
- yyyyMMMM{"MMMM y G"} |
- yyyyMMMd{"d MMM y G"} |
- yyyyMd{"dd/MM/y GGGGG"} |
- } |
- monthNames{ |
- format{ |
- abbreviated{ |
- "Muh.", |
- "Saf.", |
- "Rab. I", |
- "Rab. II", |
- "Jum. I", |
- "Jum. II", |
- "Raj.", |
- "Sha.", |
- "Ram.", |
- "Shaw.", |
- "Dhuʻl-Q.", |
- "Dhuʻl-H.", |
- } |
- narrow{ |
- "1", |
- "2", |
- "3", |
- "4", |
- "5", |
- "6", |
- "7", |
- "8", |
- "9", |
- "10", |
- "11", |
- "12", |
- } |
- wide{ |
- "Muharram", |
- "Safar", |
- "Rabiʻ I", |
- "Rabiʻ II", |
- "Jumada I", |
- "Jumada II", |
- "Rajab", |
- "Shaʻban", |
- "Ramadan", |
- "Shawwal", |
- "Dhuʻl-Qiʻdah", |
- "Dhuʻl-Hijjah", |
- } |
+ } |
+ fields{ |
+ dayperiod{ |
+ dn{"am/pm"} |
+ } |
+ hour-narrow{ |
+ relativeTime{ |
+ future{ |
+ one{"in {0} hr"} |
+ other{"in {0} hr"} |
} |
- stand-alone{ |
- abbreviated{ |
- "Muh.", |
- "Saf.", |
- "Rab. I", |
- "Rab. II", |
- "Jum. I", |
- "Jum. II", |
- "Raj.", |
- "Sha.", |
- "Ram.", |
- "Shaw.", |
- "Dhuʻl-Q.", |
- "Dhuʻl-H.", |
- } |
- narrow{ |
- "1", |
- "2", |
- "3", |
- "4", |
- "5", |
- "6", |
- "7", |
- "8", |
- "9", |
- "10", |
- "11", |
- "12", |
- } |
- wide{ |
- "Muharram", |
- "Safar", |
- "Rabiʻ I", |
- "Rabiʻ II", |
- "Jumada I", |
- "Jumada II", |
- "Rajab", |
- "Shaʻban", |
- "Ramadan", |
- "Shawwal", |
- "Dhuʻl-Qiʻdah", |
- "Dhuʻl-Hijjah", |
- } |
+ past{ |
+ one{"{0} hr ago"} |
+ other{"{0} hr ago"} |
} |
} |
} |
- 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 GGGGG", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
- "{1} {0}", |
+ hour-short{ |
+ dn{"hr"} |
+ relativeTime{ |
+ future{ |
+ one{"in {0} hr"} |
+ other{"in {0} hr"} |
+ } |
+ past{ |
+ one{"{0} hr ago"} |
+ other{"{0} hr ago"} |
+ } |
} |
} |
- } |
- durationUnits{ |
- hm{"h:mm"} |
- hms{"h:mm:ss"} |
- ms{"m:ss"} |
- } |
- fields{ |
- day-narrow{ |
+ minute-narrow{ |
relativeTime{ |
future{ |
- one{"+{0} day"} |
- other{"+{0} days"} |
+ one{"in {0} min"} |
+ other{"in {0} min"} |
} |
past{ |
- one{"-{0} day"} |
- other{"-{0} days"} |
+ one{"{0} min ago"} |
+ other{"{0} min ago"} |
} |
} |
} |
- day-short{ |
+ minute-short{ |
+ dn{"min"} |
relativeTime{ |
future{ |
- one{"in {0} day"} |
- other{"in {0} days"} |
+ one{"in {0} min"} |
+ other{"in {0} min"} |
} |
past{ |
- one{"{0} day ago"} |
- other{"{0} days ago"} |
+ one{"{0} min ago"} |
+ other{"{0} min ago"} |
} |
} |
} |
- dayperiod{ |
- dn{"am/pm"} |
- } |
- hour-narrow{ |
- dn{"h"} |
+ month-narrow{ |
+ dn{"mo"} |
relativeTime{ |
future{ |
- one{"+{0} h"} |
- other{"+{0} h"} |
+ one{"in {0} mo"} |
} |
past{ |
- one{"-{0} h"} |
- other{"-{0} h"} |
+ one{"{0} mo ago"} |
} |
} |
} |
- minute-narrow{ |
+ month-short{ |
+ dn{"mo"} |
relativeTime{ |
future{ |
- one{"+{0} m"} |
- other{"+{0} m"} |
+ one{"in {0} mo"} |
+ other{"in {0} mo"} |
} |
past{ |
- one{"-{0} m"} |
- other{"-{0} m"} |
+ one{"{0} mo ago"} |
+ other{"{0} mo ago"} |
} |
} |
} |
- month-narrow{ |
+ quarter-narrow{ |
+ dn{"qtr"} |
relativeTime{ |
future{ |
- one{"+{0} mo."} |
- other{"+{0} mo."} |
+ one{"in {0} qtr"} |
} |
past{ |
- one{"-{0} mo."} |
- other{"-{0} mo."} |
+ one{"{0} qtr ago"} |
} |
} |
} |
- quarter-narrow{ |
+ quarter-short{ |
+ dn{"qtr"} |
relativeTime{ |
future{ |
- one{"+{0} Q"} |
- other{"+{0} Q"} |
+ one{"in {0} qtr"} |
+ other{"in {0} qtr"} |
} |
past{ |
- one{"-{0} Q"} |
- other{"-{0} Q"} |
+ one{"{0} qtr ago"} |
+ other{"{0} qtr ago"} |
} |
} |
} |
second-narrow{ |
relativeTime{ |
future{ |
- one{"+{0} s"} |
- other{"+{0} s"} |
+ one{"in {0} sec"} |
+ other{"in {0} sec"} |
} |
past{ |
- one{"-{0} s ago"} |
- other{"-{0} s ago"} |
+ one{"{0} sec ago"} |
+ other{"{0} sec ago"} |
+ } |
+ } |
+ } |
+ second-short{ |
+ dn{"sec"} |
+ relativeTime{ |
+ future{ |
+ one{"in {0} sec"} |
+ other{"in {0} sec"} |
+ } |
+ past{ |
+ one{"{0} sec ago"} |
+ other{"{0} sec ago"} |
} |
} |
} |
week-narrow{ |
+ dn{"wk"} |
relativeTime{ |
future{ |
- one{"+{0} wk."} |
- other{"+{0} wk."} |
+ one{"in {0} wk"} |
} |
past{ |
- one{"-{0} wk."} |
- other{"-{0} wk."} |
+ one{"{0} wk ago"} |
+ other{"{0} wk ago"} |
+ } |
+ } |
+ } |
+ week-short{ |
+ dn{"wk"} |
+ relativeTime{ |
+ future{ |
+ one{"in {0} wk"} |
+ other{"in {0} wk"} |
+ } |
+ past{ |
+ one{"{0} wk ago"} |
+ other{"{0} wk ago"} |
} |
} |
} |
year-narrow{ |
relativeTime{ |
future{ |
- one{"+{0} yr."} |
- other{"+{0} yr."} |
+ one{"in {0} yr"} |
} |
past{ |
- one{"-{0} yr."} |
- other{"-{0} yr."} |
+ one{"{0} yr ago"} |
+ } |
+ } |
+ } |
+ year-short{ |
+ dn{"yr"} |
+ relativeTime{ |
+ future{ |
+ one{"in {0} yr"} |
+ other{"in {0} yr"} |
+ } |
+ past{ |
+ one{"{0} yr ago"} |
+ other{"{0} yr ago"} |
} |
} |
} |
@@ -799,8 +240,5 @@ en_GB{ |
standard{ |
end{"{0} and {1}"} |
} |
- unit{ |
- end{"{0} and {1}"} |
- } |
} |
} |