Update.

	* intl/locale.alias: nb_NO is now the correct name, not no_NO.

5 files changed, 22 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 7389e1daf4..87c47fb0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-11-03  Ulrich Drepper  <drepper@redhat.com>
 
+	* intl/locale.alias: nb_NO is now the correct name, not no_NO.
+
 	* locale/iso-639.def: Add Blin.
 	Patch by Daniel Yacob <locales@geez.org>.
 
diff --git a/intl/locale.alias b/intl/locale.alias
index 08c250d35d..4cacf88b3d 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,5 +1,5 @@
 # Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -58,9 +58,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
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
+no_NO		nb_NO.ISO-8859-1
+no_NO.ISO-8859-1 nb_NO.ISO-8859-1
+norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
 portuguese      pt_PT.ISO-8859-1
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 3fd872c09c..5bbc7f2774 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,7 @@
 2003-11-03  Ulrich Drepper  <drepper@redhat.com>
 
+	* SUPPORTED (SUPPORTED-LOCALES): Rename no_NO to nb_NO.
+
 	* SUPPORTED (SUPPORTED-LOCALES): Add more support locales.
 
 2003-11-03  Ulrich Drepper  <drepper@redhat.com>
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 8d0869d901..16bd552bef 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -139,8 +139,8 @@ nl_BE/ISO-8859-1 \
 nl_BE@euro/ISO-8859-15 \
 nl_NL/ISO-8859-1 \
 nl_NL@euro/ISO-8859-15 \
+nb_NO/ISO-8859-1 \
 nn_NO/ISO-8859-1 \
-no_NO/ISO-8859-1 \
 oc_FR/ISO-8859-1 \
 om_ET/UTF-8 \
 om_KE/ISO-8859-1 \
diff --git a/localedata/locales/no_NO b/localedata/locales/nb_NO
index f6b6a7c6b9..8976a1be29 100644
--- a/localedata/locales/no_NO
+++ b/localedata/locales/nb_NO
@@ -21,29 +21,29 @@ comment_char    %
 % for commercial purposes.
 
 LC_IDENTIFICATION
-title      "Norwegian locale for Norway"
+title      "Norwegian (Bokmal) locale for Norway"
 source     "Norsk Standardiseringsforbund"
 address    "University Library,, Drammensveien 41, N-9242 Oslo, Norge"
 contact    ""
 email      "bug-glibc@gnu.org"
 tel        ""
 fax        ""
-language   "Norwegian"
+language   "Norwegian Bokm<U00E5>l"
 territory  "Norway"
 revision   "1.0"
 date       "2000-06-29"
 %
-category  "no_NO:2000";LC_IDENTIFICATION
-category  "no_NO:2000";LC_CTYPE
-category  "no_NO:2000";LC_COLLATE
-category  "no_NO:2000";LC_TIME
-category  "no_NO:2000";LC_NUMERIC
-category  "no_NO:2000";LC_MONETARY
-category  "no_NO:2000";LC_MESSAGES
-category  "no_NO:2000";LC_PAPER
-category  "no_NO:2000";LC_NAME
-category  "no_NO:2000";LC_ADDRESS
-category  "no_NO:2000";LC_TELEPHONE
+category  "nb_NO:2000";LC_IDENTIFICATION
+category  "nb_NO:2000";LC_CTYPE
+category  "nb_NO:2000";LC_COLLATE
+category  "nb_NO:2000";LC_TIME
+category  "nb_NO:2000";LC_NUMERIC
+category  "nb_NO:2000";LC_MONETARY
+category  "nb_NO:2000";LC_MESSAGES
+category  "nb_NO:2000";LC_PAPER
+category  "nb_NO:2000";LC_NAME
+category  "nb_NO:2000";LC_ADDRESS
+category  "nb_NO:2000";LC_TELEPHONE
 
 END LC_IDENTIFICATION