resources/locales/en-GB/fields.yml in twitter_cldr-3.6.0 vs resources/locales/en-GB/fields.yml in twitter_cldr-4.0.0

- old
+ new

@@ -1,10 +1,10 @@ --- :en-GB: :fields: :day: - :display_name: Day + :display_name: day :relative: -1: yesterday 0: today 1: tomorrow :relative_time: @@ -12,18 +12,10 @@ :one: "in {0} day" :other: "in {0} days" :past: :one: "{0} day ago" :other: "{0} days ago" - :day-narrow: - :relative_time: - :future: - :one: "+{0} day" - :other: "+{0} days" - :past: - :one: "-{0} day" - :other: "-{0} days" :day-short: :display_name: day :relative_time: :future: :one: "in {0} day" @@ -32,11 +24,11 @@ :one: "{0} day ago" :other: "{0} days ago" :dayperiod: :display_name: am/pm :era: - :display_name: Era + :display_name: era :fri: :relative: -1: "last Friday" 0: "this Friday" 1: "next Friday" @@ -49,63 +41,61 @@ :relative: -1: "last Fri." 0: "this Fri." 1: "next Fri." :hour: - :display_name: Hour + :display_name: hour :relative_time: :future: :one: "in {0} hour" :other: "in {0} hours" :past: :one: "{0} hour ago" :other: "{0} hours ago" :hour-narrow: - :display_name: h :relative_time: :future: - :one: "+{0} h" - :other: "+{0} h" + :one: "in {0} hr" + :other: "in {0} hr" :past: - :one: "-{0} h" - :other: "-{0} h" + :one: "{0} hr ago" + :other: "{0} hr ago" :hour-short: - :display_name: hr. + :display_name: hr :relative_time: :future: - :one: "in {0} hr." - :other: "in {0} hr." + :one: "in {0} hr" + :other: "in {0} hr" :past: - :one: "{0} hr. ago" - :other: "{0} hr. ago" + :one: "{0} hr ago" + :other: "{0} hr ago" :minute: - :display_name: Minute + :display_name: minute :relative_time: :future: :one: "in {0} minute" :other: "in {0} minutes" :past: :one: "{0} minute ago" :other: "{0} minutes ago" :minute-narrow: - :display_name: m :relative_time: :future: - :one: "+{0} m" - :other: "+{0} m" + :one: "in {0} min" + :other: "in {0} min" :past: - :one: "-{0} m" - :other: "-{0} m" + :one: "{0} min ago" + :other: "{0} min ago" :minute-short: - :display_name: min. + :display_name: min :relative_time: :future: - :one: "in {0} min." - :other: "in {0} min." + :one: "in {0} min" + :other: "in {0} min" :past: - :one: "{0} min. ago" - :other: "{0} min. ago" + :one: "{0} min ago" + :other: "{0} min ago" :mon: :relative: -1: "last Monday" 0: "this Monday" 1: "next Monday" @@ -118,11 +108,11 @@ :relative: -1: "last Mon." 0: "this Mon." 1: "next Mon." :month: - :display_name: Month + :display_name: month :relative: -1: "last month" 0: "this month" 1: "next month" :relative_time: @@ -131,32 +121,33 @@ :other: "in {0} months" :past: :one: "{0} month ago" :other: "{0} months ago" :month-narrow: + :display_name: mo :relative_time: :future: - :one: "+{0} mo." - :other: "+{0} mo." + :one: "in {0} mo" + :other: "in {0} mo" :past: - :one: "-{0} mo." - :other: "-{0} mo." + :one: "{0} mo ago" + :other: "{0} mo ago" :month-short: - :display_name: mo. + :display_name: mo :relative: -1: "last mo." 0: "this mo." 1: "next mo." :relative_time: :future: - :one: "in {0} mo." - :other: "in {0} mo." + :one: "in {0} mo" + :other: "in {0} mo" :past: - :one: "{0} mo. ago" - :other: "{0} mo. ago" + :one: "{0} mo ago" + :other: "{0} mo ago" :quarter: - :display_name: Quarter + :display_name: quarter :relative: -1: "last quarter" 0: "this quarter" 1: "next quarter" :relative_time: @@ -165,30 +156,31 @@ :other: "in {0} quarters" :past: :one: "{0} quarter ago" :other: "{0} quarters ago" :quarter-narrow: + :display_name: qtr :relative_time: :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" :quarter-short: - :display_name: qtr. + :display_name: qtr :relative: -1: "last qtr." 0: "this qtr." 1: "next qtr." :relative_time: :future: - :one: "in {0} qtr." - :other: "in {0} qtrs." + :one: "in {0} qtr" + :other: "in {0} qtr" :past: - :one: "{0} qtr. ago" - :other: "{0} qtrs. ago" + :one: "{0} qtr ago" + :other: "{0} qtr ago" :sat: :relative: -1: "last Saturday" 0: "this Saturday" 1: "next Saturday" @@ -201,40 +193,39 @@ :relative: -1: "last Sat." 0: "this Sat." 1: "next Sat." :second: - :display_name: Second + :display_name: second :relative: 0: now :relative_time: :future: :one: "in {0} second" :other: "in {0} seconds" :past: :one: "{0} second ago" :other: "{0} seconds ago" :second-narrow: - :display_name: s :relative_time: :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: - :display_name: sec. + :display_name: sec :relative: 0: now :relative_time: :future: - :one: "in {0} sec." - :other: "in {0} sec." + :one: "in {0} sec" + :other: "in {0} sec" :past: - :one: "{0} sec. ago" - :other: "{0} sec. ago" + :one: "{0} sec ago" + :other: "{0} sec ago" :sun: :relative: -1: "last Sunday" 0: "this Sunday" 1: "next Sunday" @@ -292,11 +283,11 @@ :relative: -1: "last Wed." 0: "this Wed." 1: "next Wed." :week: - :display_name: Week + :display_name: week :relative: -1: "last week" 0: "this week" 1: "next week" :relative_time: @@ -305,34 +296,35 @@ :other: "in {0} weeks" :past: :one: "{0} week ago" :other: "{0} weeks ago" :week-narrow: + :display_name: wk :relative_time: :future: - :one: "+{0} wk." - :other: "+{0} wk." + :one: "in {0} wk" + :other: "in {0} wk" :past: - :one: "-{0} wk." - :other: "-{0} wk." + :one: "{0} wk ago" + :other: "{0} wk ago" :week-short: - :display_name: wk. + :display_name: wk :relative: -1: "last wk." 0: "this wk." 1: "next wk." :relative_time: :future: - :one: "in {0} wk." - :other: "in {0} wk." + :one: "in {0} wk" + :other: "in {0} wk" :past: - :one: "{0} wk. ago" - :other: "{0} wk. ago" + :one: "{0} wk ago" + :other: "{0} wk ago" :weekday: - :display_name: "Day of the Week" + :display_name: "day of the week" :year: - :display_name: Year + :display_name: year :relative: -1: "last year" 0: "this year" 1: "next year" :relative_time: @@ -343,25 +335,25 @@ :one: "{0} year ago" :other: "{0} years ago" :year-narrow: :relative_time: :future: - :one: "+{0} yr." - :other: "+{0} yr." + :one: "in {0} yr" + :other: "in {0} yr" :past: - :one: "-{0} yr." - :other: "-{0} yr." + :one: "{0} yr ago" + :other: "{0} yr ago" :year-short: - :display_name: yr. + :display_name: yr :relative: -1: "last yr." 0: "this yr." 1: "next yr." :relative_time: :future: - :one: "in {0} yr." - :other: "in {0} yr." + :one: "in {0} yr" + :other: "in {0} yr" :past: - :one: "{0} yr. ago" - :other: "{0} yr. ago" + :one: "{0} yr ago" + :other: "{0} yr ago" :zone: - :display_name: "Time Zone" + :display_name: "time zone"