Index: source/data/locales/nb.txt |
diff --git a/source/data/locales/nb.txt b/source/data/locales/nb.txt |
index 7e73f5421af0e82ce494c0de5465b1002c77cf88..55189c4550a2c8d86ddc3cf5c2a5810982fa29fd 100644 |
--- a/source/data/locales/nb.txt |
+++ b/source/data/locales/nb.txt |
@@ -1,6 +1,6 @@ |
// *************************************************************************** |
// * |
-// * Copyright (C) 2013 International Business Machines |
+// * Copyright (C) 2014 International Business Machines |
// * Corporation and others. All Rights Reserved. |
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter |
// * Source File: <path>/common/main/nb.xml |
@@ -27,6 +27,7 @@ nb{ |
} |
MoreInformation{"?"} |
NumberElements{ |
+ default{"latn"} |
latn{ |
miscPatterns{ |
atLeast{"⩾{0}"} |
@@ -155,10 +156,13 @@ nb{ |
percentSign{"%"} |
plusSign{"+"} |
superscriptingExponent{"×"} |
+ timeSeparator{"."} |
} |
} |
+ minimumGroupingDigits{"1"} |
+ native{"latn"} |
} |
- Version{"2.0.92.87"} |
+ Version{"2.1.8.9"} |
calendar{ |
buddhist{ |
eras{ |
@@ -190,8 +194,8 @@ nb{ |
GyMMMEd{"E d. MMM y G"} |
GyMMMd{"d. MMM y G"} |
H{"HH"} |
- Hm{"HH:mm"} |
- Hms{"HH:mm:ss"} |
+ Hm{"HH.mm"} |
+ Hms{"HH.mm.ss"} |
M{"L."} |
MEd{"E d.M"} |
MMM{"LLL"} |
@@ -201,9 +205,9 @@ nb{ |
Md{"d.M."} |
d{"d."} |
h{"h a"} |
- hm{"h:mm a"} |
- hms{"h:mm:ss a"} |
- ms{"mm:ss"} |
+ hm{"h.mm a"} |
+ hms{"h.mm.ss a"} |
+ ms{"mm.ss"} |
y{"y G"} |
yyyy{"y G"} |
yyyyM{"M.y G"} |
@@ -222,12 +226,12 @@ nb{ |
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"} |
+ H{"HH.mm–HH.mm v"} |
+ m{"HH.mm–HH.mm v"} |
} |
Hv{ |
H{"HH–HH v"} |
@@ -263,14 +267,14 @@ nb{ |
h{"h–h a"} |
} |
hm{ |
- a{"h:mm a – h:mm a"} |
- 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{ |
- a{"h:mm a – h:mm a v"} |
- h{"h:mm–h:mm a v"} |
- m{"h:mm–h:mm a v"} |
+ 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"} |
@@ -318,6 +322,10 @@ nb{ |
"a.m.", |
"p.m.", |
} |
+ AmPmMarkersAbbr{ |
+ "a.m.", |
+ "p.m.", |
+ } |
AmPmMarkersNarrow{ |
"a", |
"p", |
@@ -330,17 +338,20 @@ nb{ |
"EEEE d. MMMM y", |
"d. MMMM y", |
"d. MMM y", |
- "dd.MM.yy", |
+ "dd.MM.y", |
"{1}, {0}", |
"{1} {0}", |
"{1} 'kl.' {0}", |
"{1}, {0}", |
"{1}, {0}", |
} |
+ NoonMarker{"kl. 12"} |
+ NoonMarkerNarrow{"12"} |
appendItems{ |
Timezone{"{0} {1}"} |
} |
availableFormats{ |
+ E{"ccc"} |
EHm{"E HH.mm"} |
EHms{"E HH.mm.ss"} |
Ed{"E d."} |
@@ -460,14 +471,26 @@ nb{ |
"f.Kr.", |
"e.Kr.", |
} |
+ abbreviated%variant{ |
+ "fvt.", |
+ "vt.", |
+ } |
narrow{ |
"f.Kr.", |
"e.Kr.", |
} |
+ narrow%variant{ |
+ "fvt.", |
+ "vt", |
+ } |
wide{ |
"f.Kr.", |
"e.Kr.", |
} |
+ wide%variant{ |
+ "før vår tidsregning", |
+ "vår tidsregning", |
+ } |
} |
intervalFormats{ |
H{ |
@@ -511,22 +534,22 @@ nb{ |
} |
fallback{"{0}–{1}"} |
h{ |
- a{"H–H"} |
- h{"H–H"} |
+ a{"h a – h a"} |
+ h{"h–h a"} |
} |
hm{ |
- a{"H.mm–H.mm"} |
- h{"H.mm–H.mm"} |
- m{"H.mm–H.mm"} |
+ a{"h.mm a – h.mm a"} |
+ h{"h.mm–h.mm a"} |
+ m{"h.mm–h.mm a"} |
} |
hmv{ |
- a{"H.mm–H.mm v"} |
- h{"H.mm–H.mm v"} |
- m{"H.mm–H.mm v"} |
+ 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–H v"} |
- h{"H–H v"} |
+ a{"h a – h a v"} |
+ h{"h–h a v"} |
} |
y{ |
y{"y–y"} |
@@ -738,7 +761,7 @@ nb{ |
} |
} |
contextTransforms{ |
- tense:intvector{ |
+ relative:intvector{ |
0, |
1, |
} |
@@ -775,6 +798,32 @@ nb{ |
} |
} |
} |
+ day-narrow{ |
+ dn{"dag"} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} d."} |
+ other{"+{0} d."} |
+ } |
+ past{ |
+ one{"-{0} d."} |
+ other{"-{0} d."} |
+ } |
+ } |
+ } |
+ day-short{ |
+ dn{"dag"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} døgn"} |
+ other{"om {0} døgn"} |
+ } |
+ past{ |
+ one{"for {0} døgn siden"} |
+ other{"for {0} døgn siden"} |
+ } |
+ } |
+ } |
dayperiod{ |
dn{"AM/PM"} |
} |
@@ -788,6 +837,20 @@ nb{ |
"1"{"fredag neste uke"} |
} |
} |
+ fri-narrow{ |
+ relative{ |
+ "-1"{"forrige fr."} |
+ "0"{"denne fr."} |
+ "1"{"kommende fr."} |
+ } |
+ } |
+ fri-short{ |
+ relative{ |
+ "-1"{"forrige fre."} |
+ "0"{"denne fre."} |
+ "1"{"kommende fre."} |
+ } |
+ } |
hour{ |
dn{"Time"} |
relativeTime{ |
@@ -801,6 +864,32 @@ nb{ |
} |
} |
} |
+ hour-narrow{ |
+ dn{"t"} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} t"} |
+ other{"+{0} t"} |
+ } |
+ past{ |
+ one{"-{0} t"} |
+ other{"-{0} t"} |
+ } |
+ } |
+ } |
+ hour-short{ |
+ dn{"t"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} t"} |
+ other{"om {0} t"} |
+ } |
+ past{ |
+ one{"for {0} t siden"} |
+ other{"for {0} t siden"} |
+ } |
+ } |
+ } |
minute{ |
dn{"Minutt"} |
relativeTime{ |
@@ -814,6 +903,32 @@ nb{ |
} |
} |
} |
+ minute-narrow{ |
+ dn{"m"} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} min"} |
+ other{"+{0} min"} |
+ } |
+ past{ |
+ one{"-{0} min"} |
+ other{"-{0} min"} |
+ } |
+ } |
+ } |
+ minute-short{ |
+ dn{"min"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} min"} |
+ other{"om {0} min"} |
+ } |
+ past{ |
+ one{"for {0} min siden"} |
+ other{"for {0} min siden"} |
+ } |
+ } |
+ } |
mon{ |
relative{ |
"-1"{"mandag sist uke"} |
@@ -821,12 +936,26 @@ nb{ |
"1"{"mandag neste uke"} |
} |
} |
+ mon-narrow{ |
+ relative{ |
+ "-1"{"forrige ma."} |
+ "0"{"denne ma."} |
+ "1"{"kommende ma."} |
+ } |
+ } |
+ mon-short{ |
+ relative{ |
+ "-1"{"forrige man."} |
+ "0"{"denne man."} |
+ "1"{"kommende man."} |
+ } |
+ } |
month{ |
dn{"Måned"} |
relative{ |
- "-1"{"Sist måned"} |
- "0"{"Denne måneden"} |
- "1"{"Neste måned"} |
+ "-1"{"forrige måned"} |
+ "0"{"denne måneden"} |
+ "1"{"neste måned"} |
} |
relativeTime{ |
future{ |
@@ -839,6 +968,71 @@ nb{ |
} |
} |
} |
+ month-narrow{ |
+ dn{"md."} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} md."} |
+ other{"+{0} md."} |
+ } |
+ past{ |
+ one{"-{0} md."} |
+ other{"-{0} md."} |
+ } |
+ } |
+ } |
+ month-short{ |
+ dn{"mnd."} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} måneder"} |
+ other{"om {0} måneder"} |
+ } |
+ past{ |
+ one{"for {0} måneder siden"} |
+ other{"for {0} måneder siden"} |
+ } |
+ } |
+ } |
+ quarter{ |
+ dn{"Kvartal"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} kvartal"} |
+ other{"om {0} kvartaler"} |
+ } |
+ past{ |
+ one{"for {0} kvartal siden"} |
+ other{"for {0} kvartaler siden"} |
+ } |
+ } |
+ } |
+ quarter-narrow{ |
+ dn{"kv."} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} kv."} |
+ other{"+{0} kv."} |
+ } |
+ past{ |
+ one{"–{0} kv."} |
+ other{"–{0} kv."} |
+ } |
+ } |
+ } |
+ quarter-short{ |
+ dn{"kv."} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} kv."} |
+ other{"om {0} kv."} |
+ } |
+ past{ |
+ one{"for {0} kv. siden"} |
+ other{"for {0} kv. siden"} |
+ } |
+ } |
+ } |
sat{ |
relative{ |
"-1"{"lørdag sist uke"} |
@@ -846,6 +1040,20 @@ nb{ |
"1"{"lørdag neste uke"} |
} |
} |
+ sat-narrow{ |
+ relative{ |
+ "-1"{"forrige lø."} |
+ "0"{"denne lø."} |
+ "1"{"kommende lø."} |
+ } |
+ } |
+ sat-short{ |
+ relative{ |
+ "-1"{"forrige lør."} |
+ "0"{"denne lør."} |
+ "1"{"kommende lør."} |
+ } |
+ } |
second{ |
dn{"Sekund"} |
relative{ |
@@ -862,6 +1070,32 @@ nb{ |
} |
} |
} |
+ second-narrow{ |
+ dn{"s"} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} s"} |
+ other{"+{0} s"} |
+ } |
+ past{ |
+ one{"-{0} s"} |
+ other{"-{0} s"} |
+ } |
+ } |
+ } |
+ second-short{ |
+ dn{"sek"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} sek"} |
+ other{"om {0} sek"} |
+ } |
+ past{ |
+ one{"for {0} sek siden"} |
+ other{"for {0} sek siden"} |
+ } |
+ } |
+ } |
sun{ |
relative{ |
"-1"{"søndag sist uke"} |
@@ -869,6 +1103,20 @@ nb{ |
"1"{"søndag neste uke"} |
} |
} |
+ sun-narrow{ |
+ relative{ |
+ "-1"{"forrige sø."} |
+ "0"{"denne sø."} |
+ "1"{"kommende sø."} |
+ } |
+ } |
+ sun-short{ |
+ relative{ |
+ "-1"{"forrige søn."} |
+ "0"{"denne søn."} |
+ "1"{"kommende søn."} |
+ } |
+ } |
thu{ |
relative{ |
"-1"{"torsdag sist uke"} |
@@ -876,6 +1124,20 @@ nb{ |
"1"{"torsdag neste uke"} |
} |
} |
+ thu-narrow{ |
+ relative{ |
+ "-1"{"forrige to."} |
+ "0"{"denne to."} |
+ "1"{"kommende to."} |
+ } |
+ } |
+ thu-short{ |
+ relative{ |
+ "-1"{"forrige tor."} |
+ "0"{"denne tor."} |
+ "1"{"kommende tor."} |
+ } |
+ } |
tue{ |
relative{ |
"-1"{"tirsdag sist uke"} |
@@ -883,6 +1145,20 @@ nb{ |
"1"{"tirsdag neste uke"} |
} |
} |
+ tue-narrow{ |
+ relative{ |
+ "-1"{"forrige ti."} |
+ "0"{"denne ti."} |
+ "1"{"kommende ti."} |
+ } |
+ } |
+ tue-short{ |
+ relative{ |
+ "-1"{"forrige tir."} |
+ "0"{"denne tir."} |
+ "1"{"kommende tir."} |
+ } |
+ } |
wed{ |
relative{ |
"-1"{"onsdag sist uke"} |
@@ -890,12 +1166,26 @@ nb{ |
"1"{"onsdag neste uke"} |
} |
} |
+ wed-narrow{ |
+ relative{ |
+ "-1"{"forrige on."} |
+ "0"{"denne on."} |
+ "1"{"kommende on."} |
+ } |
+ } |
+ wed-short{ |
+ relative{ |
+ "-1"{"forrige ons."} |
+ "0"{"denne ons."} |
+ "1"{"kommende ons."} |
+ } |
+ } |
week{ |
dn{"Uke"} |
relative{ |
- "-1"{"Sist uke"} |
- "0"{"Denne uken"} |
- "1"{"Neste uke"} |
+ "-1"{"forrige uke"} |
+ "0"{"denne uken"} |
+ "1"{"neste uke"} |
} |
relativeTime{ |
future{ |
@@ -908,15 +1198,41 @@ nb{ |
} |
} |
} |
+ week-narrow{ |
+ dn{"uke"} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} u."} |
+ other{"+{0} u."} |
+ } |
+ past{ |
+ one{"-{0} u."} |
+ other{"-{0} u."} |
+ } |
+ } |
+ } |
+ week-short{ |
+ dn{"uke"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} uke"} |
+ other{"om {0} uker"} |
+ } |
+ past{ |
+ one{"for {0} uke siden"} |
+ other{"for {0} uker siden"} |
+ } |
+ } |
+ } |
weekday{ |
dn{"Ukedag"} |
} |
year{ |
dn{"År"} |
relative{ |
- "-1"{"I fjor"} |
- "0"{"Dette året"} |
- "1"{"Neste år"} |
+ "-1"{"i fjor"} |
+ "0"{"i år"} |
+ "1"{"neste år"} |
} |
relativeTime{ |
future{ |
@@ -929,6 +1245,32 @@ nb{ |
} |
} |
} |
+ year-narrow{ |
+ dn{"år"} |
+ relativeTime{ |
+ future{ |
+ one{"+{0} år"} |
+ other{"+{0} år"} |
+ } |
+ past{ |
+ one{"–{0} år"} |
+ other{"–{0} år"} |
+ } |
+ } |
+ } |
+ year-short{ |
+ dn{"år"} |
+ relativeTime{ |
+ future{ |
+ one{"om {0} år"} |
+ other{"om {0} år"} |
+ } |
+ past{ |
+ one{"for {0} år siden"} |
+ other{"for {0} år siden"} |
+ } |
+ } |
+ } |
zone{ |
dn{"Tidssone"} |
} |
@@ -947,14 +1289,14 @@ nb{ |
start{"{0}, {1}"} |
} |
unit-narrow{ |
- 2{"{0} og {1}"} |
- end{"{0} og {1}"} |
+ 2{"{0}, {1}"} |
+ end{"{0}, {1}"} |
middle{"{0}, {1}"} |
start{"{0}, {1}"} |
} |
unit-short{ |
- 2{"{0} og {1}"} |
- end{"{0} og {1}"} |
+ 2{"{0}, {1}"} |
+ end{"{0}, {1}"} |
middle{"{0}, {1}"} |
start{"{0}, {1}"} |
} |
@@ -976,121 +1318,4 @@ nb{ |
x-Pinyin{"Pinyin"} |
x-Publishing{"For publisering"} |
} |
- units{ |
- compound{ |
- per{"{0} per {1}"} |
- } |
- duration{ |
- day{ |
- one{"{0} døgn"} |
- other{"{0} døgn"} |
- } |
- hour{ |
- one{"{0} time"} |
- other{"{0} timer"} |
- } |
- millisecond{ |
- one{"{0} millisekund"} |
- other{"{0} millisekunder"} |
- } |
- minute{ |
- one{"{0} minutt"} |
- other{"{0} minutter"} |
- } |
- month{ |
- one{"{0} måned"} |
- other{"{0} måneder"} |
- } |
- second{ |
- one{"{0} sekund"} |
- other{"{0} sekunder"} |
- } |
- week{ |
- one{"{0} uke"} |
- other{"{0} uker"} |
- } |
- year{ |
- one{"{0} år"} |
- other{"{0} år"} |
- } |
- } |
- } |
- unitsNarrow{ |
- compound{ |
- per{"{0}/{1}"} |
- } |
- duration{ |
- day{ |
- one{"{0}d"} |
- other{"{0}d"} |
- } |
- hour{ |
- one{"{0}t"} |
- other{"{0}t"} |
- } |
- millisecond{ |
- one{"{0}ms"} |
- other{"{0}ms"} |
- } |
- minute{ |
- one{"{0}m"} |
- other{"{0}m"} |
- } |
- month{ |
- one{"{0} m"} |
- other{"{0} m"} |
- } |
- second{ |
- one{"{0}s"} |
- other{"{0}s"} |
- } |
- week{ |
- one{"{0}u"} |
- other{"{0}u"} |
- } |
- year{ |
- one{"{0}å"} |
- other{"{0}å"} |
- } |
- } |
- } |
- unitsShort{ |
- compound{ |
- per{"{0}/{1}"} |
- } |
- duration{ |
- day{ |
- one{"{0} d"} |
- other{"{0} d"} |
- } |
- hour{ |
- one{"{0} t"} |
- other{"{0} t"} |
- } |
- millisecond{ |
- one{"{0} ms"} |
- other{"{0} ms"} |
- } |
- minute{ |
- one{"{0} min"} |
- other{"{0} min"} |
- } |
- month{ |
- one{"{0} mnd"} |
- other{"{0} mnd"} |
- } |
- second{ |
- one{"{0} sek"} |
- other{"{0} sek"} |
- } |
- week{ |
- one{"{0} u"} |
- other{"{0} u"} |
- } |
- year{ |
- one{"{0} år"} |
- other{"{0} år"} |
- } |
- } |
- } |
} |