| Index: source/data/locales/en.txt
|
| diff --git a/source/data/locales/en.txt b/source/data/locales/en.txt
|
| index 2dacacfec10e0d7db70ef67900f01a86e8dc811f..3cbca24135379268816a0b1f4ea98516cea331d3 100644
|
| --- a/source/data/locales/en.txt
|
| +++ b/source/data/locales/en.txt
|
| @@ -1,14 +1,11 @@
|
| // ***************************************************************************
|
| // *
|
| -// * 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.xml
|
| // *
|
| // ***************************************************************************
|
| -/**
|
| - * ICU <specials> source: <path>/common/main/en.xml
|
| - */
|
| en{
|
| AuxExemplarCharacters{
|
| "[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ"
|
| @@ -20,9 +17,6 @@ en{
|
| "[\\- ‐ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ "
|
| "″]"
|
| }
|
| - LocaleScript{
|
| - "Latn",
|
| - }
|
| NumberElements{
|
| latn{
|
| miscPatterns{
|
| @@ -88,6 +82,56 @@ en{
|
| }
|
| }
|
| patternsShort{
|
| + currencyFormat{
|
| + 1000{
|
| + one{"¤0K"}
|
| + other{"¤0K"}
|
| + }
|
| + 10000{
|
| + one{"¤00K"}
|
| + other{"¤00K"}
|
| + }
|
| + 100000{
|
| + one{"¤000K"}
|
| + other{"¤000K"}
|
| + }
|
| + 1000000{
|
| + one{"¤0M"}
|
| + other{"¤0M"}
|
| + }
|
| + 10000000{
|
| + one{"¤00M"}
|
| + other{"¤00M"}
|
| + }
|
| + 100000000{
|
| + one{"¤000M"}
|
| + other{"¤000M"}
|
| + }
|
| + 1000000000{
|
| + one{"¤0B"}
|
| + other{"¤0B"}
|
| + }
|
| + 10000000000{
|
| + one{"¤00B"}
|
| + other{"¤00B"}
|
| + }
|
| + 100000000000{
|
| + one{"¤000B"}
|
| + other{"¤000B"}
|
| + }
|
| + 1000000000000{
|
| + one{"¤0T"}
|
| + other{"¤0T"}
|
| + }
|
| + 10000000000000{
|
| + one{"¤00T"}
|
| + other{"¤00T"}
|
| + }
|
| + 100000000000000{
|
| + one{"¤000T"}
|
| + other{"¤000T"}
|
| + }
|
| + }
|
| decimalFormat{
|
| 1000{
|
| one{"0K"}
|
| @@ -154,7 +198,7 @@ en{
|
| }
|
| }
|
| }
|
| - Version{"2.1.8.87"}
|
| + Version{"2.1.19.72"}
|
| calendar{
|
| buddhist{
|
| eras{
|
| @@ -169,10 +213,10 @@ en{
|
| "h:mm:ss a z",
|
| "h:mm:ss a",
|
| "h:mm a",
|
| - "EEEE, MMMM d, U",
|
| - "MMMM d, U",
|
| - "MMM d, U",
|
| - "M/d/yy",
|
| + "EEEE, MMMM d, r(U)",
|
| + "MMMM d, r(U)",
|
| + "MMM d, r",
|
| + "M/d/r",
|
| "{1}, {0}",
|
| "{1} 'at' {0}",
|
| "{1} 'at' {0}",
|
| @@ -186,10 +230,10 @@ en{
|
| Ed{"d E"}
|
| Ehm{"E h:mm a"}
|
| Ehms{"E h:mm:ss a"}
|
| - Gy{"U"}
|
| - GyMMM{"MMM U"}
|
| - GyMMMEd{"E, MMM d, U"}
|
| - GyMMMd{"MMM d, U"}
|
| + Gy{"r(U)"}
|
| + GyMMM{"MMM r(U)"}
|
| + GyMMMEd{"E, MMM d, r(U)"}
|
| + GyMMMd{"MMM d, r"}
|
| H{"HH"}
|
| Hm{"HH:mm"}
|
| Hms{"HH:mm:ss"}
|
| @@ -197,24 +241,30 @@ en{
|
| MEd{"E, M/d"}
|
| MMM{"LLL"}
|
| MMMEd{"E, MMM d"}
|
| + MMMMd{"MMMM d"}
|
| MMMd{"MMM d"}
|
| Md{"M/d"}
|
| + UM{"M/U"}
|
| + UMMM{"MMM U"}
|
| + UMMMd{"MMM d, U"}
|
| + UMd{"M/d/U"}
|
| d{"d"}
|
| h{"h a"}
|
| hm{"h:mm a"}
|
| hms{"h:mm:ss a"}
|
| ms{"mm:ss"}
|
| - y{"U"}
|
| - yMd{"M/d/y"}
|
| - yyyy{"U"}
|
| - yyyyM{"M/y"}
|
| - yyyyMEd{"E, M/d/y"}
|
| - yyyyMMM{"MMM U"}
|
| - yyyyMMMEd{"E, MMM d, U"}
|
| - yyyyMMMd{"MMM d, U"}
|
| - yyyyMd{"M/d/y"}
|
| - yyyyQQQ{"QQQ U"}
|
| - yyyyQQQQ{"QQQQ U"}
|
| + y{"r(U)"}
|
| + yMd{"M/d/r"}
|
| + yyyy{"r(U)"}
|
| + yyyyM{"M/r"}
|
| + yyyyMEd{"E, M/d/r"}
|
| + yyyyMMM{"MMM r(U)"}
|
| + yyyyMMMEd{"E, MMM d, r(U)"}
|
| + yyyyMMMM{"MMMM r(U)"}
|
| + yyyyMMMd{"MMM d, r"}
|
| + yyyyMd{"M/d/r"}
|
| + yyyyQQQ{"QQQ r(U)"}
|
| + yyyyQQQQ{"QQQQ r(U)"}
|
| }
|
| cyclicNameSets{
|
| zodiacs{
|
| @@ -348,18 +398,18 @@ en{
|
| "Mo12",
|
| }
|
| 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",
|
| }
|
| }
|
| }
|
| @@ -411,6 +461,7 @@ en{
|
| MEd{"E, M/d"}
|
| MMM{"LLL"}
|
| MMMEd{"E, MMM d"}
|
| + MMMMd{"MMMM d"}
|
| MMMd{"MMM d"}
|
| Md{"M/d"}
|
| d{"d"}
|
| @@ -424,6 +475,7 @@ en{
|
| yyyyMEd{"E, M/d/y GGGGG"}
|
| yyyyMMM{"MMM y G"}
|
| yyyyMMMEd{"E, MMM d, y G"}
|
| + yyyyMMMM{"MMMM y G"}
|
| yyyyMMMd{"MMM d, y G"}
|
| yyyyMd{"M/d/y GGGGG"}
|
| yyyyQQQ{"QQQ y G"}
|
| @@ -534,6 +586,14 @@ en{
|
| "am",
|
| "pm",
|
| }
|
| + AmPmMarkersAbbr{
|
| + "AM",
|
| + "PM",
|
| + }
|
| + AmPmMarkersAbbr%variant{
|
| + "am",
|
| + "pm",
|
| + }
|
| AmPmMarkersNarrow{
|
| "a",
|
| "p",
|
| @@ -553,8 +613,6 @@ en{
|
| "{1}, {0}",
|
| "{1}, {0}",
|
| }
|
| - NoonMarker{"noon"}
|
| - NoonMarkerNarrow{"n"}
|
| appendItems{
|
| Day{"{0} ({2}: {1})"}
|
| Day-Of-Week{"{0} {1}"}
|
| @@ -582,22 +640,28 @@ en{
|
| H{"HH"}
|
| Hm{"HH:mm"}
|
| Hms{"HH:mm:ss"}
|
| + Hmsv{"HH:mm:ss v"}
|
| + Hmv{"HH:mm v"}
|
| M{"L"}
|
| MEd{"E, M/d"}
|
| MMM{"LLL"}
|
| MMMEd{"E, MMM d"}
|
| + MMMMd{"MMMM d"}
|
| MMMd{"MMM d"}
|
| Md{"M/d"}
|
| 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{"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"}
|
| @@ -645,6 +709,46 @@ en{
|
| }
|
| }
|
| }
|
| + dayPeriod{
|
| + format{
|
| + abbreviated{
|
| + afternoon1{"in the afternoon"}
|
| + evening1{"in the evening"}
|
| + midnight{"midnight"}
|
| + morning1{"in the morning"}
|
| + night1{"at night"}
|
| + noon{"noon"}
|
| + }
|
| + narrow{
|
| + afternoon1{"in the afternoon"}
|
| + evening1{"in the evening"}
|
| + midnight{"mi"}
|
| + morning1{"in the morning"}
|
| + night1{"at night"}
|
| + noon{"n"}
|
| + }
|
| + wide{
|
| + afternoon1{"in the afternoon"}
|
| + evening1{"in the evening"}
|
| + midnight{"midnight"}
|
| + morning1{"in the morning"}
|
| + night1{"at night"}
|
| + noon{"noon"}
|
| + }
|
| + }
|
| + stand-alone{
|
| + wide{
|
| + afternoon1{"afternoon"}
|
| + am{"AM"}
|
| + evening1{"evening"}
|
| + midnight{"midnight"}
|
| + morning1{"morning"}
|
| + night1{"night"}
|
| + noon{"noon"}
|
| + pm{"PM"}
|
| + }
|
| + }
|
| + }
|
| eras{
|
| abbreviated{
|
| "BC",
|
| @@ -860,6 +964,7 @@ en{
|
| MEd{"E, d MMM"}
|
| MMM{"LLL"}
|
| MMMEd{"E, d MMM"}
|
| + MMMMd{"d MMMM"}
|
| MMMd{"d MMM"}
|
| Md{"d MMM"}
|
| y{"y"}
|
| @@ -867,6 +972,7 @@ en{
|
| yMEd{"E, d MMM y"}
|
| yMMM{"MMM y"}
|
| yMMMEd{"E, d MMM y"}
|
| + yMMMM{"MMMM y"}
|
| yMMMd{"d MMM y"}
|
| yMd{"d MMM y"}
|
| yQQQ{"QQQ y"}
|
| @@ -996,7 +1102,7 @@ en{
|
| }
|
| fields{
|
| day{
|
| - dn{"Day"}
|
| + dn{"day"}
|
| relative{
|
| "-1"{"yesterday"}
|
| "0"{"today"}
|
| @@ -1015,12 +1121,23 @@ en{
|
| }
|
| day-short{
|
| dn{"day"}
|
| + relativeTime{
|
| + future{
|
| + one{"in {0} day"}
|
| + other{"in {0} days"}
|
| + }
|
| + past{
|
| + one{"{0} day ago"}
|
| + other{"{0} days ago"}
|
| + }
|
| + }
|
| }
|
| dayperiod{
|
| dn{"AM/PM"}
|
| + dn%variant{"am/pm"}
|
| }
|
| era{
|
| - dn{"Era"}
|
| + dn{"era"}
|
| }
|
| fri{
|
| relative{
|
| @@ -1044,7 +1161,7 @@ en{
|
| }
|
| }
|
| hour{
|
| - dn{"Hour"}
|
| + dn{"hour"}
|
| relativeTime{
|
| future{
|
| one{"in {0} hour"}
|
| @@ -1070,7 +1187,7 @@ en{
|
| }
|
| }
|
| minute{
|
| - dn{"Minute"}
|
| + dn{"minute"}
|
| relativeTime{
|
| future{
|
| one{"in {0} minute"}
|
| @@ -1117,7 +1234,7 @@ en{
|
| }
|
| }
|
| month{
|
| - dn{"Month"}
|
| + dn{"month"}
|
| relative{
|
| "-1"{"last month"}
|
| "0"{"this month"}
|
| @@ -1153,7 +1270,7 @@ en{
|
| }
|
| }
|
| quarter{
|
| - dn{"Quarter"}
|
| + dn{"quarter"}
|
| relative{
|
| "-1"{"last quarter"}
|
| "0"{"this quarter"}
|
| @@ -1210,7 +1327,7 @@ en{
|
| }
|
| }
|
| second{
|
| - dn{"Second"}
|
| + dn{"second"}
|
| relative{
|
| "0"{"now"}
|
| }
|
| @@ -1326,7 +1443,7 @@ en{
|
| }
|
| }
|
| week{
|
| - dn{"Week"}
|
| + dn{"week"}
|
| relative{
|
| "-1"{"last week"}
|
| "0"{"this week"}
|
| @@ -1362,10 +1479,10 @@ en{
|
| }
|
| }
|
| weekday{
|
| - dn{"Day of the Week"}
|
| + dn{"day of the week"}
|
| }
|
| year{
|
| - dn{"Year"}
|
| + dn{"year"}
|
| relative{
|
| "-1"{"last year"}
|
| "0"{"this year"}
|
| @@ -1401,7 +1518,7 @@ en{
|
| }
|
| }
|
| zone{
|
| - dn{"Time Zone"}
|
| + dn{"time zone"}
|
| }
|
| }
|
| listPattern{
|
|
|