Update to glibc-2.2.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 649f1ff6f5a8f32773b12b88561de4087ef81739..97f90c3287b5f24c861532ec20a85ce819df2f42 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-26  GOTO Masanori  <gotom@debian.or.jp>
+
+       * locale.alias: Add ja_JP.ujis alias.
+
+2000-08-31  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale.alias: Add aliases for bokmal and nynorsk.
+
+2000-08-21  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale.alias: Add aliases for Korean.
+
+2000-08-01  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale.alias: Update japanese aliases.
+
 2000-05-06  Ulrich Drepper  <drepper@redhat.com>
 
        * gettextize.in: Remove code to test for version of the m4 files.

diff --git a/misc/locale.alias b/misc/locale.alias
index b9084715902d827d7524bb10d94edd39d9c8fb28..d6fa49636fea06383fdd48b69d2fcf0ab4728034 100644 (file)
--- a/misc/locale.alias
+++ b/misc/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
@@ -47,10 +49,18 @@ hrvatski    hr_HR.ISO-8859-2
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1
 italian         it_IT.ISO-8859-1
-japanese       ja_JP.SJIS
+japanese       ja_JP.eucJP
 japanese.euc   ja_JP.eucJP
+ja_JP          ja_JP.eucJP
+ja_JP.ujis     ja_JP.eucJP
+japanese.sjis  ja_JP.SJIS
+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