Update.

	* intl/locale.alias: Add aliases for bomal and nynorsk.

	* locale/iso-639.def: Fix 639-1 code for Bokmal.

6 files changed, 201 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b97055..663d288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-08-31  Ulrich Drepper  <drepper@redhat.com>
 
+	* intl/locale.alias: Add aliases for bomal and nynorsk.
+
+	* locale/iso-639.def: Fix 639-1 code for Bokmal.
+
 	* stdio-common/itoa-digits.c: Move upper digits to...
 	* stdio-common/itoa-udigits.c: ...here.  New file.
 	* stdio-common/Makefile (routines): Add itoa-udigits.
diff --git a/intl/locale.alias b/intl/locale.alias
index 60b47f5..799405a 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -26,6 +26,8 @@
 # it with the rest of us.  Send it using the `glibcbug' script to
 # bugs@gnu.org.
 
+bokmal		nb_NO.ISO-8859-1
+bokmål		nb_NO.ISO-8859-1
 catalan		ca_ES.ISO-8859-1
 croatian	hr_HR.ISO-8859-2
 czech		cs_CZ.ISO-8859-2
@@ -55,7 +57,9 @@ korean		ko_KR.eucKR
 korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
 lithuanian      lt_LT.ISO-8859-13
+nb_NO		no_NO.ISO-8859-1
 norwegian       no_NO.ISO-8859-1
+nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
 portuguese      pt_PT.ISO-8859-1
 romanian        ro_RO.ISO-8859-2
diff --git a/locale/iso-639.def b/locale/iso-639.def
index 29af160..76d7801 100644
--- a/locale/iso-639.def
+++ b/locale/iso-639.def
@@ -106,7 +106,7 @@ DEFINE_LANGUAGE_CODE ("Ndonga", ng, ndo, ndo)
 DEFINE_LANGUAGE_CODE ("Nepali", ne, nep, nep)
 DEFINE_LANGUAGE_CODE ("Norwegian", no, nor, nor)
 DEFINE_LANGUAGE_CODE ("Norwegian Nynorsk", nn, nno, nno)
-DEFINE_LANGUAGE_CODE ("Norwegian Bokmål", nn, nob, nob)
+DEFINE_LANGUAGE_CODE ("Norwegian Bokmål", nb, nob, nob)
 DEFINE_LANGUAGE_CODE ("Chichewa; Nyanja", ny, nya, nya)
 DEFINE_LANGUAGE_CODE ("Occitan (post 1500); Provençal", oc, oci, oci)
 DEFINE_LANGUAGE_CODE ("Oriya", or, ori, ori)
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5882575..366fb5e 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* SUPPORTED: Add nn_NO.ISO-8859-1.
+	* locales/nn_NO: New file.
+
 2000-08-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/BIG5HKSCS: Regenerated from official data file.
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 726a83f..adb1964 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -108,6 +108,7 @@ nl_BE@euro ISO-8859-15
 nl_NL ISO-8859-1
 nl_NL@euro ISO-8859-15
 no_NO ISO-8859-1
+nn_NO ISO-8859-1
 pl_PL ISO-8859-2
 pt_BR ISO-8859-1
 pt_PT ISO-8859-1
diff --git a/localedata/locales/nn_NO b/localedata/locales/nn_NO
new file mode 100644
index 0000000..216f177
--- /dev/null
+++ b/localedata/locales/nn_NO
@@ -0,0 +1,186 @@
+comment_char    %
+escape_char     /
+% Nynorsk language locale for Norway.
+% Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
+% Tetsuji Orita <orita@jp.ibm.com>.
+
+LC_IDENTIFICATION
+title      "Nynorsk language locale for Norway"
+source     "IBM Globalization Center of Competency, Yamato Software Laboratory"
+address    "1623-14, Shimotsuruma, Yamato-shi, Kanagawa-ken, 242-8502, Japan"
+contact    ""
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "Norwegian, Nynorsk"
+territory  "Norway"
+revision   "1.0"
+date       "2000-08-31"
+%
+category  "nn_NO:2000";LC_IDENTIFICATION
+category  "nn_NO:2000";LC_CTYPE
+category  "nn_NO:2000";LC_COLLATE
+category  "nn_NO:2000";LC_TIME
+category  "nn_NO:2000";LC_NUMERIC
+category  "nn_NO:2000";LC_MONETARY
+category  "nn_NO:2000";LC_MESSAGES
+category  "nn_NO:2000";LC_PAPER
+category  "nn_NO:2000";LC_NAME
+category  "nn_NO:2000";LC_ADDRESS
+category  "nn_NO:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+END LC_CTYPE
+
+LC_COLLATE
+
+% Copy the template from ISO/IEC 14651
+copy "iso14651_t1"
+
+END LC_COLLATE
+
+
+LC_MONETARY
+% This is the POSIX Locale definition the LC_MONETARY category.
+% These are generated based on XML base Locale difintion file
+% for IBM Class for Unicode/Java
+%
+int_curr_symbol       "<U004E><U004F><U004B><U0020>"
+currency_symbol       "<U006B><U0072>"
+mon_decimal_point     "<U002C>"
+mon_thousands_sep     "<U00A0>"
+mon_grouping          3
+positive_sign         ""
+negative_sign         "<U002D>"
+int_frac_digits       2
+frac_digits           2
+p_cs_precedes         1
+p_sep_by_space        1
+n_cs_precedes         1
+n_sep_by_space        0
+p_sign_posn           1
+n_sign_posn           3
+%
+END LC_MONETARY
+
+
+LC_NUMERIC
+% This is the POSIX Locale definition for the LC_NUMERIC  category.
+%
+decimal_point          "<U002C>"
+thousands_sep          "<U00A0>"
+grouping               3
+%
+END LC_NUMERIC
+
+
+LC_TIME
+% This is the POSIX Locale definition for the LC_TIME category.
+% These are generated based on XML base Locale difintion file
+% for IBM Class for Unicode/Java
+%
+% Abbreviated weekday names (%a)
+abday       "<U0073><U0075><U0020>";"<U006D><U00E5><U0020>";/
+            "<U0074><U0079><U0020>";"<U006F><U006E><U0020>";/
+            "<U0074><U006F><U0020>";"<U0066><U0072><U0020>";/
+            "<U006C><U0061><U0075><U0020>"
+%
+% Full weekday names (%A)
+day         "<U0073><U0075><U006E><U0064><U0061><U0067><U0020>";/
+            "<U006D><U00E5><U006E><U0064><U0061><U0067><U0020>";/
+            "<U0074><U0079><U0073><U0064><U0061><U0067><U0020>";/
+            "<U006F><U006E><U0073><U0064><U0061><U0067><U0020>";/
+            "<U0074><U006F><U0072><U0073><U0064><U0061><U0067><U0020>";/
+            "<U0066><U0072><U0065><U0064><U0061><U0067><U0020>";/
+            "<U006C><U0061><U0075><U0072><U0064><U0061><U0067><U0020>"
+%
+% Abbreviated month names (%b)
+abmon       "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/
+            "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
+            "<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/
+            "<U006A><U0075><U006C>";"<U0061><U0075><U0067>";/
+            "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/
+            "<U006E><U006F><U0076>";"<U0064><U0065><U0073>"
+%
+% Full month names (%B)
+mon         "<U006A><U0061><U006E><U0075><U0061><U0072>";/
+            "<U0066><U0065><U0062><U0072><U0075><U0061><U0072>";/
+            "<U006D><U0061><U0072><U0073>";/
+            "<U0061><U0070><U0072><U0069><U006C>";/
+            "<U006D><U0061><U0069>";/
+            "<U006A><U0075><U006E><U0069>";/
+            "<U006A><U0075><U006C><U0069>";/
+            "<U0061><U0075><U0067><U0075><U0073><U0074>";/
+            "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
+            "<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/
+            "<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
+            "<U0064><U0065><U0073><U0065><U006D><U0062><U0065><U0072>"
+%
+% Equivalent of AM PM
+am_pm       "";""
+%
+% Appropriate date and time representation
+% %d. %b %Ykl %H.%M %Z
+d_t_fmt     "<U0025><U0064><U002E><U0020><U0025><U0062><U0020><U0025>/
+<U0059><U0020><U006B><U006C><U0020><U0025><U0048><U002E><U0025><U004D>/
+<U0020><U0025><U005A>"
+%
+% Appropriate date representation
+% %d. %b %Y
+d_fmt       "<U0025><U0064><U002E><U0020><U0025><U0062><U0020><U0025><U0059>"
+%
+% Appropriate time representation
+% kl %H.%M %Z
+t_fmt       "<U006B><U006C><U0020><U0025><U0048><U002E><U0025><U004D>/
+<U0020><U0025><U005A>"
+%
+% Appropriate 12 h time representation (%r)
+t_fmt_ampm  ""
+%
+END LC_TIME
+
+
+LC_MESSAGES
+yesexpr     "<U005E><U005B><U004A><U006A><U0059><U0079><U005D><U002E><U002A>"
+noexpr      "<U005E><U005B><U004E><U006E><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+
+LC_PAPER
+height      297
+width       210
+END LC_PAPER
+
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+END LC_ADDRESS
+
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U006C>"
+tel_dom_fmt    "<U0025><U006C>"
+int_select     "<U0030><U0030>"
+int_prefix     "<U0034><U0037>"
+END LC_TELEPHONE
+
+
+LC_MEASUREMENT
+% This is the ISO_IEC TR14652 Locale definition for the
+%
+measurement 1
+
+END LC_MEASUREMENT