From 4b89ac4b2e3084852fe2ade3cd8e9f7f0801d984 Mon Sep 17 00:00:00 2001
From: "ftang%netscape.com" <ftang%netscape.com>
Date: Tue, 15 May 2001 12:54:23 +0000
Subject: [PATCH] fix bug 80725. change GB2312 to gb18030 support property file
 change rs

---
 intl/uconv/src/charsetalias.properties | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/intl/uconv/src/charsetalias.properties b/intl/uconv/src/charsetalias.properties
index 32bc2cb7d32a..5e4bf9c9c0fa 100644
--- a/intl/uconv/src/charsetalias.properties
+++ b/intl/uconv/src/charsetalias.properties
@@ -92,7 +92,7 @@ shift_jis=Shift_JIS
 big5=Big5
 euc-jp=EUC-JP
 euc-kr=EUC-KR
-gb2312=GB2312
+gb2312=gb18030
 gb18030=gb18030
 viscii=VISCII
 koi8-r=KOI8-R
@@ -281,11 +281,13 @@ csksc56011987=EUC-KR
 ## Aliases for GB2312
 ##
 # The following are really not aliases GB2312, add them only for MS FrontPage
-gb_2312-80=GB2312
-iso-ir-58=GB2312
-chinese=GB2312
-csiso58gb231280=GB2312
-csgb2312=GB2312
+# gb18030 is now super set of GB2312. A lot of page still labled as GB2312
+# we need to use gb18030 instead
+gb_2312-80=gb18030
+iso-ir-58=gb18030
+chinese=gb18030
+csiso58gb231280=gb18030
+csgb2312=gb18030
 ##
 ## Aliases for windows-125x 
 ##