ICU-605 Added nn,nb locales and aliased no_NO_NY,no and no_NO
to these.
X-SVN-Rev: 3243
diff --git a/icu4c/data/nb.txt b/icu4c/data/nb.txt
new file mode 100644
index 0000000..8d5dba8
--- /dev/null
+++ b/icu4c/data/nb.txt
@@ -0,0 +1,116 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nb {
+ CollationElements {
+ Version { "1.0" }
+ Override { "FALSE" }
+ Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
+ " < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
+ "V, w, W " }
+ }
+ Countries {
+ NO { "Norge" }
+ }
+ DateTimeElements {
+ "2",
+ "4",
+ }
+ DateTimePatterns {
+ "'kl 'HH.mm z",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "d. MMMM yyyy",
+ "d. MMMM yyyy",
+ "dd.MMM.yy",
+ "dd.MM.yy",
+ "{1} {0}",
+ }
+ DayAbbreviations {
+ "s\u00F8",
+ "ma",
+ "ti",
+ "on",
+ "to",
+ "fr",
+ "l\u00F8",
+ }
+ DayNames {
+ "s\u00F8ndag",
+ "mandag",
+ "tirsdag",
+ "onsdag",
+ "torsdag",
+ "fredag",
+ "l\u00F8rdag",
+ }
+ Languages {
+ no { "norsk" }
+ }
+ LocaleID { "14" }
+ LocaleString { "no" }
+ MonthAbbreviations {
+ "jan",
+ "feb",
+ "mar",
+ "apr",
+ "mai",
+ "jun",
+ "jul",
+ "aug",
+ "sep",
+ "okt",
+ "nov",
+ "des",
+ "",
+ }
+ MonthNames {
+ "januar",
+ "februar",
+ "mars",
+ "april",
+ "mai",
+ "juni",
+ "juli",
+ "august",
+ "september",
+ "oktober",
+ "november",
+ "desember",
+ "",
+ }
+ NumberElements {
+ ",",
+ "\u00A0",
+ ";",
+ "%",
+ "0",
+ "#",
+ "-",
+ "E",
+ "\u2030",
+ "\u221E",
+ "\uFFFD",
+ }
+ ShortLanguage { "nor" }
+ Eras {
+ "f.Kr.",
+ "e.Kr.",
+ }
+
+ zoneStrings {
+ {
+ "Europe/Oslo",
+ "Central European Time",
+ "MET",
+ "Central European Time (DST)",
+ "MET",
+ "Oslo"
+ }
+ }
+}
diff --git a/icu4c/data/nb_NO.txt b/icu4c/data/nb_NO.txt
new file mode 100644
index 0000000..acf8535
--- /dev/null
+++ b/icu4c/data/nb_NO.txt
@@ -0,0 +1,21 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nb_NO {
+ CurrencyElements {
+ "kr",
+ "NOK",
+ ",",
+ }
+ NumberPatterns {
+ "#,##0.###;-#,##0.###",
+ "\u00A4 #,##0.00;\u00A4 -#,##0.00",
+ "#,##0%",
+ }
+ ShortCountry { "NOR" }
+ LocaleID { "0414" }
+}
diff --git a/icu4c/data/nn.txt b/icu4c/data/nn.txt
new file mode 100644
index 0000000..0c96e1d
--- /dev/null
+++ b/icu4c/data/nn.txt
@@ -0,0 +1,117 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nn{
+CollationElements {
+ Version { "1.0" }
+ Override { "FALSE" }
+ Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
+ " < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
+ "V, w, W " }
+ }
+ Countries {
+ NO { "Norge" }
+ }
+ DateTimeElements {
+ "2",
+ "4",
+ }
+ DateTimePatterns {
+ "'kl 'HH.mm z",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "d. MMMM yyyy",
+ "d. MMMM yyyy",
+ "dd.MMM.yy",
+ "dd.MM.yy",
+ "{1} {0}",
+ }
+ Languages {
+ no { "norsk" }
+ }
+ LocaleString { "no" }
+ MonthAbbreviations {
+ "jan",
+ "feb",
+ "mar",
+ "apr",
+ "mai",
+ "jun",
+ "jul",
+ "aug",
+ "sep",
+ "okt",
+ "nov",
+ "des",
+ "",
+ }
+ MonthNames {
+ "januar",
+ "februar",
+ "mars",
+ "april",
+ "mai",
+ "juni",
+ "juli",
+ "august",
+ "september",
+ "oktober",
+ "november",
+ "desember",
+ "",
+ }
+ NumberElements {
+ ",",
+ "\u00A0",
+ ";",
+ "%",
+ "0",
+ "#",
+ "-",
+ "E",
+ "\u2030",
+ "\u221E",
+ "\uFFFD",
+ }
+ ShortLanguage { "nor" }
+ Eras {
+ "f.Kr.",
+ "e.Kr.",
+ }
+
+ zoneStrings {
+ {
+ "Europe/Oslo",
+ "Central European Time",
+ "MET",
+ "Central European Time (DST)",
+ "MET",
+ "Oslo"
+ }
+ }
+ DayAbbreviations {
+ "su",
+ "m\u00E5",
+ "ty",
+ "on",
+ "to",
+ "fr",
+ "lau",
+ }
+ DayNames {
+ "sundag",
+ "m\u00E5ndag",
+ "tysdag",
+ "onsdag",
+ "torsdag",
+ "fredag",
+ "laurdag",
+ }
+ /* Discarding duplicate data for tag: Languages */
+ LocaleID { "0814" }
+}
diff --git a/icu4c/data/nn_NO.txt b/icu4c/data/nn_NO.txt
new file mode 100644
index 0000000..c5b67d2
--- /dev/null
+++ b/icu4c/data/nn_NO.txt
@@ -0,0 +1,20 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nn_NO {
+ CurrencyElements {
+ "kr",
+ "NOK",
+ ",",
+ }
+ NumberPatterns {
+ "#,##0.###;-#,##0.###",
+ "\u00A4 #,##0.00;\u00A4 -#,##0.00",
+ "#,##0%",
+ }
+ ShortCountry { "NOR" }
+}
diff --git a/icu4c/data/no.txt b/icu4c/data/no.txt
index 10d9f6e..26695c2 100644
--- a/icu4c/data/no.txt
+++ b/icu4c/data/no.txt
@@ -6,111 +6,5 @@
// *******************************************************************************
no {
- CollationElements {
- Version { "1.0" }
- Override { "FALSE" }
- Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
- " < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
- "V, w, W " }
- }
- Countries {
- NO { "Norge" }
- }
- DateTimeElements {
- "2",
- "4",
- }
- DateTimePatterns {
- "'kl 'HH.mm z",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "d. MMMM yyyy",
- "d. MMMM yyyy",
- "dd.MMM.yy",
- "dd.MM.yy",
- "{1} {0}",
- }
- DayAbbreviations {
- "s\u00F8",
- "ma",
- "ti",
- "on",
- "to",
- "fr",
- "l\u00F8",
- }
- DayNames {
- "s\u00F8ndag",
- "mandag",
- "tirsdag",
- "onsdag",
- "torsdag",
- "fredag",
- "l\u00F8rdag",
- }
- Languages {
- no { "norsk" }
- }
- LocaleID { "14" }
- LocaleString { "no" }
- MonthAbbreviations {
- "jan",
- "feb",
- "mar",
- "apr",
- "mai",
- "jun",
- "jul",
- "aug",
- "sep",
- "okt",
- "nov",
- "des",
- "",
- }
- MonthNames {
- "januar",
- "februar",
- "mars",
- "april",
- "mai",
- "juni",
- "juli",
- "august",
- "september",
- "oktober",
- "november",
- "desember",
- "",
- }
- NumberElements {
- ",",
- "\u00A0",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "\u2030",
- "\u221E",
- "\uFFFD",
- }
- ShortLanguage { "nor" }
- Eras {
- "f.Kr.",
- "e.Kr.",
- }
-
- zoneStrings {
- {
- "Europe/Oslo",
- "Central European Time",
- "MET",
- "Central European Time (DST)",
- "MET",
- "Oslo"
- }
- }
+ "%%ALIAS" { "nb" }
}
diff --git a/icu4c/data/no_NO.txt b/icu4c/data/no_NO.txt
index 2446c1f..69a1ae8 100644
--- a/icu4c/data/no_NO.txt
+++ b/icu4c/data/no_NO.txt
@@ -6,17 +6,5 @@
// *******************************************************************************
no_NO {
- CurrencyElements {
- "kr",
- "NOK",
- ",",
- }
- LocaleString { "no_NO_B" }
- NumberPatterns {
- "#,##0.###;-#,##0.###",
- "\u00A4 #,##0.00;\u00A4 -#,##0.00",
- "#,##0%",
- }
- ShortCountry { "NOR" }
- LocaleID { "0414" }
+ "%%ALIAS" { "nb_NO" }
}
diff --git a/icu4c/data/no_NO_NY.txt b/icu4c/data/no_NO_NY.txt
index a126647..5aac539 100644
--- a/icu4c/data/no_NO_NY.txt
+++ b/icu4c/data/no_NO_NY.txt
@@ -6,34 +6,5 @@
// *******************************************************************************
no_NO_NY {
- DayAbbreviations {
- "su",
- "m\u00E5",
- "ty",
- "on",
- "to",
- "fr",
- "lau",
- }
- DayNames {
- "sundag",
- "m\u00E5ndag",
- "tysdag",
- "onsdag",
- "torsdag",
- "fredag",
- "laurdag",
- }
- /* Discarding duplicate data for tag: Languages */
- LocaleID { "0814" }
- LocaleString { "no_NO_NY" }
- zoneStrings {
- {
- "Africa/Casablanca",
- "GMT",
- "GMT",
- "GMT",
- "GMT",
- }
- }
+ "%%ALIAS" { "nn" }
}
diff --git a/icu4c/data/resfiles.mk b/icu4c/data/resfiles.mk
index b11dd43..cae102c 100644
--- a/icu4c/data/resfiles.mk
+++ b/icu4c/data/resfiles.mk
@@ -91,7 +91,8 @@
tr.txt tr_TR.txt\
uk.txt uk_UA.txt\
vi.txt vi_VN.txt\
-zh.txt zh_CN.txt zh_HK.txt zh_SG.txt zh_TW.txt
+zh.txt zh_CN.txt zh_HK.txt zh_SG.txt zh_TW.txt\
+nn.txt nn_NO.txt nb.txt nb_NO.txt
TRANSLIT_SOURCE=fullhalf.txt translit_index.txt kana.txt kbdescl1.txt\
larabic.txt lcyril.txt ldevan.txt\
diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt
new file mode 100644
index 0000000..8d5dba8
--- /dev/null
+++ b/icu4c/source/data/locales/nb.txt
@@ -0,0 +1,116 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nb {
+ CollationElements {
+ Version { "1.0" }
+ Override { "FALSE" }
+ Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
+ " < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
+ "V, w, W " }
+ }
+ Countries {
+ NO { "Norge" }
+ }
+ DateTimeElements {
+ "2",
+ "4",
+ }
+ DateTimePatterns {
+ "'kl 'HH.mm z",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "d. MMMM yyyy",
+ "d. MMMM yyyy",
+ "dd.MMM.yy",
+ "dd.MM.yy",
+ "{1} {0}",
+ }
+ DayAbbreviations {
+ "s\u00F8",
+ "ma",
+ "ti",
+ "on",
+ "to",
+ "fr",
+ "l\u00F8",
+ }
+ DayNames {
+ "s\u00F8ndag",
+ "mandag",
+ "tirsdag",
+ "onsdag",
+ "torsdag",
+ "fredag",
+ "l\u00F8rdag",
+ }
+ Languages {
+ no { "norsk" }
+ }
+ LocaleID { "14" }
+ LocaleString { "no" }
+ MonthAbbreviations {
+ "jan",
+ "feb",
+ "mar",
+ "apr",
+ "mai",
+ "jun",
+ "jul",
+ "aug",
+ "sep",
+ "okt",
+ "nov",
+ "des",
+ "",
+ }
+ MonthNames {
+ "januar",
+ "februar",
+ "mars",
+ "april",
+ "mai",
+ "juni",
+ "juli",
+ "august",
+ "september",
+ "oktober",
+ "november",
+ "desember",
+ "",
+ }
+ NumberElements {
+ ",",
+ "\u00A0",
+ ";",
+ "%",
+ "0",
+ "#",
+ "-",
+ "E",
+ "\u2030",
+ "\u221E",
+ "\uFFFD",
+ }
+ ShortLanguage { "nor" }
+ Eras {
+ "f.Kr.",
+ "e.Kr.",
+ }
+
+ zoneStrings {
+ {
+ "Europe/Oslo",
+ "Central European Time",
+ "MET",
+ "Central European Time (DST)",
+ "MET",
+ "Oslo"
+ }
+ }
+}
diff --git a/icu4c/source/data/locales/nb_NO.txt b/icu4c/source/data/locales/nb_NO.txt
new file mode 100644
index 0000000..acf8535
--- /dev/null
+++ b/icu4c/source/data/locales/nb_NO.txt
@@ -0,0 +1,21 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nb_NO {
+ CurrencyElements {
+ "kr",
+ "NOK",
+ ",",
+ }
+ NumberPatterns {
+ "#,##0.###;-#,##0.###",
+ "\u00A4 #,##0.00;\u00A4 -#,##0.00",
+ "#,##0%",
+ }
+ ShortCountry { "NOR" }
+ LocaleID { "0414" }
+}
diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt
new file mode 100644
index 0000000..0c96e1d
--- /dev/null
+++ b/icu4c/source/data/locales/nn.txt
@@ -0,0 +1,117 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nn{
+CollationElements {
+ Version { "1.0" }
+ Override { "FALSE" }
+ Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
+ " < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
+ "V, w, W " }
+ }
+ Countries {
+ NO { "Norge" }
+ }
+ DateTimeElements {
+ "2",
+ "4",
+ }
+ DateTimePatterns {
+ "'kl 'HH.mm z",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ "d. MMMM yyyy",
+ "d. MMMM yyyy",
+ "dd.MMM.yy",
+ "dd.MM.yy",
+ "{1} {0}",
+ }
+ Languages {
+ no { "norsk" }
+ }
+ LocaleString { "no" }
+ MonthAbbreviations {
+ "jan",
+ "feb",
+ "mar",
+ "apr",
+ "mai",
+ "jun",
+ "jul",
+ "aug",
+ "sep",
+ "okt",
+ "nov",
+ "des",
+ "",
+ }
+ MonthNames {
+ "januar",
+ "februar",
+ "mars",
+ "april",
+ "mai",
+ "juni",
+ "juli",
+ "august",
+ "september",
+ "oktober",
+ "november",
+ "desember",
+ "",
+ }
+ NumberElements {
+ ",",
+ "\u00A0",
+ ";",
+ "%",
+ "0",
+ "#",
+ "-",
+ "E",
+ "\u2030",
+ "\u221E",
+ "\uFFFD",
+ }
+ ShortLanguage { "nor" }
+ Eras {
+ "f.Kr.",
+ "e.Kr.",
+ }
+
+ zoneStrings {
+ {
+ "Europe/Oslo",
+ "Central European Time",
+ "MET",
+ "Central European Time (DST)",
+ "MET",
+ "Oslo"
+ }
+ }
+ DayAbbreviations {
+ "su",
+ "m\u00E5",
+ "ty",
+ "on",
+ "to",
+ "fr",
+ "lau",
+ }
+ DayNames {
+ "sundag",
+ "m\u00E5ndag",
+ "tysdag",
+ "onsdag",
+ "torsdag",
+ "fredag",
+ "laurdag",
+ }
+ /* Discarding duplicate data for tag: Languages */
+ LocaleID { "0814" }
+}
diff --git a/icu4c/source/data/locales/nn_NO.txt b/icu4c/source/data/locales/nn_NO.txt
new file mode 100644
index 0000000..c5b67d2
--- /dev/null
+++ b/icu4c/source/data/locales/nn_NO.txt
@@ -0,0 +1,20 @@
+// *******************************************************************************
+// *
+// * Copyright (C) 1997-2000, International Business Machines
+// * Corporation and others. All Rights Reserved.
+// *
+// *******************************************************************************
+
+nn_NO {
+ CurrencyElements {
+ "kr",
+ "NOK",
+ ",",
+ }
+ NumberPatterns {
+ "#,##0.###;-#,##0.###",
+ "\u00A4 #,##0.00;\u00A4 -#,##0.00",
+ "#,##0%",
+ }
+ ShortCountry { "NOR" }
+}
diff --git a/icu4c/source/data/locales/no.txt b/icu4c/source/data/locales/no.txt
index 10d9f6e..26695c2 100644
--- a/icu4c/source/data/locales/no.txt
+++ b/icu4c/source/data/locales/no.txt
@@ -6,111 +6,5 @@
// *******************************************************************************
no {
- CollationElements {
- Version { "1.0" }
- Override { "FALSE" }
- Sequence { "& Z < \u00E6, \u00C6 < a\u0308, A\u0308< \u00F8, \u00D8"
- " < o\u0308, O\u0308< o\u030B, O\u030B < a\u030A, A\u030A, aa , aA , Aa , AA & "
- "V, w, W " }
- }
- Countries {
- NO { "Norge" }
- }
- DateTimeElements {
- "2",
- "4",
- }
- DateTimePatterns {
- "'kl 'HH.mm z",
- "HH:mm:ss z",
- "HH:mm:ss",
- "HH:mm",
- "d. MMMM yyyy",
- "d. MMMM yyyy",
- "dd.MMM.yy",
- "dd.MM.yy",
- "{1} {0}",
- }
- DayAbbreviations {
- "s\u00F8",
- "ma",
- "ti",
- "on",
- "to",
- "fr",
- "l\u00F8",
- }
- DayNames {
- "s\u00F8ndag",
- "mandag",
- "tirsdag",
- "onsdag",
- "torsdag",
- "fredag",
- "l\u00F8rdag",
- }
- Languages {
- no { "norsk" }
- }
- LocaleID { "14" }
- LocaleString { "no" }
- MonthAbbreviations {
- "jan",
- "feb",
- "mar",
- "apr",
- "mai",
- "jun",
- "jul",
- "aug",
- "sep",
- "okt",
- "nov",
- "des",
- "",
- }
- MonthNames {
- "januar",
- "februar",
- "mars",
- "april",
- "mai",
- "juni",
- "juli",
- "august",
- "september",
- "oktober",
- "november",
- "desember",
- "",
- }
- NumberElements {
- ",",
- "\u00A0",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "\u2030",
- "\u221E",
- "\uFFFD",
- }
- ShortLanguage { "nor" }
- Eras {
- "f.Kr.",
- "e.Kr.",
- }
-
- zoneStrings {
- {
- "Europe/Oslo",
- "Central European Time",
- "MET",
- "Central European Time (DST)",
- "MET",
- "Oslo"
- }
- }
+ "%%ALIAS" { "nb" }
}
diff --git a/icu4c/source/data/locales/no_NO.txt b/icu4c/source/data/locales/no_NO.txt
index 2446c1f..69a1ae8 100644
--- a/icu4c/source/data/locales/no_NO.txt
+++ b/icu4c/source/data/locales/no_NO.txt
@@ -6,17 +6,5 @@
// *******************************************************************************
no_NO {
- CurrencyElements {
- "kr",
- "NOK",
- ",",
- }
- LocaleString { "no_NO_B" }
- NumberPatterns {
- "#,##0.###;-#,##0.###",
- "\u00A4 #,##0.00;\u00A4 -#,##0.00",
- "#,##0%",
- }
- ShortCountry { "NOR" }
- LocaleID { "0414" }
+ "%%ALIAS" { "nb_NO" }
}
diff --git a/icu4c/source/data/locales/no_NO_NY.txt b/icu4c/source/data/locales/no_NO_NY.txt
index a126647..5aac539 100644
--- a/icu4c/source/data/locales/no_NO_NY.txt
+++ b/icu4c/source/data/locales/no_NO_NY.txt
@@ -6,34 +6,5 @@
// *******************************************************************************
no_NO_NY {
- DayAbbreviations {
- "su",
- "m\u00E5",
- "ty",
- "on",
- "to",
- "fr",
- "lau",
- }
- DayNames {
- "sundag",
- "m\u00E5ndag",
- "tysdag",
- "onsdag",
- "torsdag",
- "fredag",
- "laurdag",
- }
- /* Discarding duplicate data for tag: Languages */
- LocaleID { "0814" }
- LocaleString { "no_NO_NY" }
- zoneStrings {
- {
- "Africa/Casablanca",
- "GMT",
- "GMT",
- "GMT",
- "GMT",
- }
- }
+ "%%ALIAS" { "nn" }
}
diff --git a/icu4c/source/data/locales/resfiles.mk b/icu4c/source/data/locales/resfiles.mk
index b11dd43..cae102c 100644
--- a/icu4c/source/data/locales/resfiles.mk
+++ b/icu4c/source/data/locales/resfiles.mk
@@ -91,7 +91,8 @@
tr.txt tr_TR.txt\
uk.txt uk_UA.txt\
vi.txt vi_VN.txt\
-zh.txt zh_CN.txt zh_HK.txt zh_SG.txt zh_TW.txt
+zh.txt zh_CN.txt zh_HK.txt zh_SG.txt zh_TW.txt\
+nn.txt nn_NO.txt nb.txt nb_NO.txt
TRANSLIT_SOURCE=fullhalf.txt translit_index.txt kana.txt kbdescl1.txt\
larabic.txt lcyril.txt ldevan.txt\
