Update from glibc.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 56c1449a84a915aa10ea414bc8e51b2a303c126d..06c5216076e957657c389e6da4bfd81c082e2937 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-02  Jakub Jelinek  <jakub@redhat.com>
+
+       * locale.alias: Use nb_NO instead of no_NO for bokmål.
+
+2003-11-03  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale.alias: nb_NO is now the correct name, not no_NO.
+
 2004-01-09  Bruno Haible  <bruno@clisp.org>
 
        * gmo.h (MO_REVISION_NUMBER_WITH_SYSDEP_I): New definition.

diff --git a/gettext-runtime/intl/locale.alias b/gettext-runtime/intl/locale.alias
index bd7b9b31eb31edc971d28f1abc295ced77ad7210..bd6bb2562f6ef4eaff55288b126954d395129efe 100644 (file)
--- a/gettext-runtime/intl/locale.alias
+++ b/gettext-runtime/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 Library General Public License as published
@@ -29,8 +29,8 @@
 
 # Packages using this file: 
 
-bokmal         no_NO.ISO-8859-1
-bokmål         no_NO.ISO-8859-1
+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
@@ -61,9 +61,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