diff --git a/ChangeLog b/ChangeLog
index 26758e153c..5f89902552 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,12 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2002-08-10 Alexander M. Turek  <rabus@users.sourceforge.net>
+2002-08-11 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/swedish-*.inc.php3: Updates, thanks again to Björn T. Hallberg (bth).
     * lang/slovak-*.inc.php3: Updates, thanks again to Lubos Klokner (erkac).
     * lang/polish-*.inc.php3: Updates, thanks again to Jakub Wilk (ubanus).
     * lang/albanian-*.inc.php3: Updates, thanks again to
       Laurent Dhima (laurenti).
+    * lang/chinese_*.inc.php3: Updates, thanks again to Siu Sun (siusun).
 
 2002-08-10 Robin Johnson  <robbat2@users.sourceforge.net>
     * libraries/string.lib.php3:
diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3
index dd53d5a94b..c7caf4ef09 100644
--- a/lang/chinese_big5-utf-8.inc.php3
+++ b/lang/chinese_big5-utf-8.inc.php3
@@ -1,5 +1,4 @@
 <?php
-
 /* $Id$ */
 
 /**
@@ -58,6 +57,8 @@ $strAtEndOfTable = '於資料表尾端';
 $strAttr = '屬性';
 
 $strBack = '回上一�';
+$strBeginCut = '開始 剪�';
+$strBeginRaw = '開始 原始資料';
 $strBinaryDoNotEdit = '二進制碼 - �能編輯';
 $strBinary = '二進制碼';
 $strBookmarkDeleted = '書籤已經刪除.';
@@ -77,6 +78,7 @@ $strCarriage = '歸�: \\r';
 $strChangeDisplay = '�擇顯示之欄�';
 $strChange = '修改';
 $strChangePassword = '更改密碼';
+$strCharsetOfFile = '字元表檔案:';
 $strCheckAll = '全�';
 $strCheckDbPriv = '檢查資料庫權�';
 $strCheckTable = '檢查資料表';
@@ -138,6 +140,8 @@ $strEmpty = '清空';
 $strEmptyResultSet = 'MySQL 傳回的查詢�果為空 (原因�能為：沒有找到符��件的記錄)';
 $strEnabled = 'å•Ÿå‹•';
 $strEnd = '最後一�';
+$strEndCut = '�� 剪�';
+$strEndRaw = '�� 原始資料';
 $strEnglishPrivileges = '注�: MySQL 權��稱會以英語顯示';
 $strError = '錯誤';
 $strExplain = '說明 SQL';
@@ -361,9 +365,14 @@ $strSize = '大�';
 $strSort = '排�';
 $strSpaceUsage = '已使用空間';
 $strSplitWordsWithSpace = '�組文字以空格 (" ") 分隔.';
+$strSQL = 'SQL'; // should express in english
+$strSQLParserBugMessage = '這�能是您找到了 SQL 分�程�的一些程�錯誤，請細心查看您的語法，檢查一下引號是正確�沒有��，其他�能出錯的原因�能來自您上載檔案時在引號外的地方使用了二進制碼。您�以嘗試在 MySQL 命令列介�執行該語法。如 MySQL 伺�器發出錯誤信�，這�能幫助您去找出�題所在。如您�然未能解決�題，或在分�程�出�錯誤，但在命令列模�能正常執行，請將該�出�錯誤的 SQL 語法抽出，並將以下的"剪�"部份一��交到臭虫�:';
+$strSQLParserUserError = '�能是您的 SQL 語法出�錯誤，如 MySQL 伺�器發出錯誤信�，這�能幫助您去找出�題所在。';
 $strSQLQuery = 'SQL 語法';
 $strSQLResult = 'SQL 查詢�果';
-$strSQL = 'SQL'; // should express in english
+$strSQPBugInvalidIdentifer = '無效的識別碼 (Invalid Identifer)';
+$strSQPBugUnclosedQuote = '未完�的引號 (Unclosed quote)';
+$strSQPBugUnknownPunctuation = '�知明的標點符號 (Unknown Punctuation String)';
 $strStatement = '敘述';
 $strStrucCSV = 'CSV 資料';
 $strStrucData = '�構與資料';
@@ -420,21 +429,6 @@ $strWrongUser = '錯誤的使用者�稱或密碼，拒絕存�';
 $strYes = ' 是 ';
 
 $strZip = '"zipped"';
+
 // To translate
-
-
-$strBeginCut = 'BEGIN CUT';  //to translate
-$strBeginRaw = 'BEGIN RAW';  //to translate
-
-$strCharsetOfFile = 'Character set of the file:'; //to translate
-
-$strEndCut = 'END CUT';  //to translate
-$strEndRaw = 'END RAW';  //to translate
-
-$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';  //to translate
-$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';  //to translate
-$strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
-$strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
-$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
-
 ?>
diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3
index 059b2b6006..15b00cfd0c 100644
--- a/lang/chinese_big5.inc.php3
+++ b/lang/chinese_big5.inc.php3
@@ -1,5 +1,4 @@
 <?php
-
 /* $Id$ */
 
 /**
@@ -57,6 +56,8 @@ $strAtEndOfTable = '
 $strAttr = 'ÄÝ©Ê';
 
 $strBack = '¦^¤W¤@­¶';
+$strBeginCut = '¶}©l °Å¨ú';
+$strBeginRaw = '¶}©l ­ì©l¸ê®Æ';
 $strBinaryDoNotEdit = '¤G¶i¨î½X - ¤£¯à½s¿è';
 $strBinary = '¤G¶i¨î½X';
 $strBookmarkDeleted = '®ÑÅÒ¤w¸g§R°£.';
@@ -76,6 +77,7 @@ $strCarriage = '
 $strChangeDisplay = '¿ï¾ÜÅã¥Ü¤§Äæ¦ì';
 $strChange = '­×§ï';
 $strChangePassword = '§ó§ï±K½X';
+$strCharsetOfFile = '¦r¤¸ªíÀÉ®×:';
 $strCheckAll = '¥þ¿ï';
 $strCheckDbPriv = 'Àˬd¸ê®Æ®wÅv­­';
 $strCheckTable = 'Àˬd¸ê®Æªí';
@@ -137,6 +139,8 @@ $strEmpty = '
 $strEmptyResultSet = 'MySQL ¶Ç¦^ªº¬d¸ßµ²ªG¬°ªÅ (­ì¦]¥i¯à¬°¡G¨S¦³§ä¨ì²Å¦X±ø¥óªº°O¿ý)';
 $strEnabled = '±Ò°Ê';
 $strEnd = '³Ì«á¤@­¶';
+$strEndCut = 'µ²§ô °Å¨ú';
+$strEndRaw = 'µ²§ô ­ì©l¸ê®Æ';
 $strEnglishPrivileges = 'ª`·N: MySQL Åv­­¦WºÙ·|¥H­^»yÅã¥Ü';
 $strError = '¿ù»~';
 $strExplain = '»¡©ú SQL';
@@ -360,9 +364,14 @@ $strSize = '
 $strSort = '±Æ§Ç';
 $strSpaceUsage = '¤w¨Ï¥ÎªÅ¶¡';
 $strSplitWordsWithSpace = '¨C²Õ¤å¦r¥HªÅ®æ (" ") ¤À¹j.';
+$strSQL = 'SQL'; // should express in english
+$strSQLParserBugMessage = '³o¥i¯à¬O±z§ä¨ì¤F SQL ¤ÀªRµ{¦¡ªº¤@¨Çµ{¦¡¿ù»~¡A½Ð²Ó¤ß¬d¬Ý±zªº»yªk¡AÀˬd¤@¤U¤Þ¸¹¬O¥¿½T¤Î¨S¦³¿òº|¡A¨ä¥L¥i¯à¥X¿ùªº­ì¦]¥i¯à¨Ó¦Û±z¤W¸üÀɮ׮ɦb¤Þ¸¹¥~ªº¦a¤è¨Ï¥Î¤F¤G¶i¨î½X¡C±z¥i¥H¹Á¸Õ¦b MySQL ©R¥O¦C¤¶­±°õ¦æ¸Ó»yªk¡C¦p MySQL ¦øªA¾¹µo¥X¿ù»~«H®§¡A³o¥i¯àÀ°§U±z¥h§ä¥X°ÝÃD©Ò¦b¡C¦p±z¤´µM¥¼¯à¸Ñ¨M°ÝÃD¡A©Î¦b¤ÀªRµ{¦¡¥X²{¿ù»~¡A¦ý¦b©R¥O¦C¼Ò¦¡¯à¥¿±`°õ¦æ¡A½Ð±N¸Ó¥y¥X²{¿ù»~ªº SQL »yªk©â¥X¡A¨Ã±N¥H¤Uªº"°Å¨ú"³¡¥÷¤@¦P´£¥æ¨ì¯ä¦ä°Ï:';
+$strSQLParserUserError = '¥i¯à¬O±zªº SQL »yªk¥X²{¿ù»~¡A¦p MySQL ¦øªA¾¹µo¥X¿ù»~«H®§¡A³o¥i¯àÀ°§U±z¥h§ä¥X°ÝÃD©Ò¦b¡C';
 $strSQLQuery = 'SQL »yªk';
 $strSQLResult = 'SQL ¬d¸ßµ²ªG';
-$strSQL = 'SQL'; // should express in english
+$strSQPBugInvalidIdentifer = 'µL®ÄªºÃѧO½X (Invalid Identifer)';
+$strSQPBugUnclosedQuote = '¥¼§¹µ²ªº¤Þ¸¹ (Unclosed quote)';
+$strSQPBugUnknownPunctuation = '¤£ª¾©úªº¼ÐÂI²Å¸¹ (Unknown Punctuation String)';
 $strStatement = '±Ô­z';
 $strStrucCSV = 'CSV ¸ê®Æ';
 $strStrucData = 'µ²ºc»P¸ê®Æ';
@@ -419,21 +428,6 @@ $strWrongUser = '
 $strYes = ' ¬O ';
 
 $strZip = '"zipped"';
+
 // To translate
-
-
-$strBeginCut = 'BEGIN CUT';  //to translate
-$strBeginRaw = 'BEGIN RAW';  //to translate
-
-$strCharsetOfFile = 'Character set of the file:'; //to translate
-
-$strEndCut = 'END CUT';  //to translate
-$strEndRaw = 'END RAW';  //to translate
-
-$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';  //to translate
-$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';  //to translate
-$strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
-$strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
-$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
-
 ?>
diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3
index 9ddca5d074..617dfaee99 100644
--- a/lang/chinese_gb-utf-8.inc.php3
+++ b/lang/chinese_gb-utf-8.inc.php3
@@ -1,5 +1,4 @@
 <?php
-
 /* $Id$ */
 
 /**
@@ -57,6 +56,8 @@ $strAtEndOfTable = '于数�表尾端';
 $strAttr = '属性';
 
 $strBack = '返回';
+$strBeginCut = '开始 剪�';
+$strBeginRaw = '开始 原始资料';
 $strBinaryDoNotEdit = ' 二进制� - 无法编辑 ';
 $strBinary = ' 二进制� ';
 $strBookmarkDeleted = '标签已�删除.';
@@ -76,6 +77,7 @@ $strCarriage = '回车: \\r';
 $strChange = '改�';
 $strChangeDisplay = '选择显示之字段';
 $strChangePassword = '更改密�';
+$strCharsetOfFile = '字元表档案:';
 $strCheckAll = '全选';
 $strCheckDbPriv = '检查数�库��';
 $strCheckTable = '检查数�表';
@@ -137,6 +139,8 @@ $strEmpty = '清空';
 $strEmptyResultSet = 'MySQL 返回的查询结果为空。 (原因�能为：没有找到符��件的记录。)';
 $strEnabled = '�动';
 $strEnd = '结�';
+$strEndCut = '结� 剪�';
+$strEndRaw = '结� 原始资料';
 $strEnglishPrivileges = ' 注�: MySQL ���称会被解释�英文 ';
 $strError = '错误';
 $strExplain = '说明 SQL';
@@ -359,9 +363,14 @@ $strSize = '大�';
 $strSort = '排�';
 $strSpaceUsage = '已使用空间';
 $strSplitWordsWithSpace = '�组文字以空格 (" ") 分隔.';
+$strSQL = 'SQL'; // should express in english
+$strSQLParserBugMessage = '这�能是您找到了 SQL 分折的一些程�错误，请细心查看您的语�，检查一下引�是正确�没有��，其他�能出错的原因�能�自您上传档案时在引�外的地方使用了二进制�。您�以�试在 MySQL 命令列介�执行该语�。如 MySQL 伺�器�出错误信�，这�能帮助您去找出问题所在。如您�然未能解决问题，或在分�程�出现错误，但在命令列模�能正常执行，请将该�出现错误的 SQL 语�抽出，并将以下的"剪�"部份一��交到臭虫区:';
+$strSQLParserUserError = '�能是您的 SQL 语�出现错误，如 MySQL 伺�器�出错误信�，这�能帮助您去找出问题所在。';
 $strSQLQuery = 'SQL 语�';
 $strSQLResult = 'SQL 查询结果';
-$strSQL = 'SQL'; // should express in english
+$strSQPBugInvalidIdentifer = '无效的识别� (Invalid Identifer)';
+$strSQPBugUnclosedQuote = '未完结的引� (Unclosed quote)';
+$strSQPBugUnknownPunctuation = '�知明的标点符� (Unknown Punctuation String)';
 $strStatement = '�述';
 $strStrucCSV = 'CSV 数�';
 $strStrucData = '结构和数�';
@@ -418,21 +427,6 @@ $strWrongUser = '密�错误，访问被拒�。';
 $strYes = '是';
 
 $strZip = '"zipped"';
+
 // To translate
-
-
-$strBeginCut = 'BEGIN CUT';  //to translate
-$strBeginRaw = 'BEGIN RAW';  //to translate
-
-$strCharsetOfFile = 'Character set of the file:'; //to translate
-
-$strEndCut = 'END CUT';  //to translate
-$strEndRaw = 'END RAW';  //to translate
-
-$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';  //to translate
-$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';  //to translate
-$strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
-$strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
-$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
-
 ?>
diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3
index 3718311c77..418276a3bc 100644
--- a/lang/chinese_gb.inc.php3
+++ b/lang/chinese_gb.inc.php3
@@ -1,5 +1,4 @@
 <?php
-
 /* $Id$ */
 
 /**
@@ -56,6 +55,8 @@ $strAtEndOfTable = '
 $strAttr = 'ÊôÐÔ';
 
 $strBack = '·µ»Ø';
+$strBeginCut = '&#24320;©l °Å¨ú';
+$strBeginRaw = '&#24320;©l ­ì©l&#36164;®Æ';
 $strBinaryDoNotEdit = ' ¶þ½øÖÆÂë - ÎÞ·¨±à¼­ ';
 $strBinary = ' ¶þ½øÖÆÂë ';
 $strBookmarkDeleted = '±êÇ©ÒѾ­É¾³ý.';
@@ -75,6 +76,7 @@ $strCarriage = '
 $strChange = '¸Ä±ä';
 $strChangeDisplay = 'Ñ¡ÔñÏÔʾ֮×Ö¶Î';
 $strChangePassword = '¸ü¸ÄÃÜÂë';
+$strCharsetOfFile = '¦r¤¸ªí&#26723;®×:';
 $strCheckAll = 'È«Ñ¡';
 $strCheckDbPriv = '¼ì²éÊý¾Ý¿âȨÏÞ';
 $strCheckTable = '¼ì²éÊý¾Ý±í';
@@ -136,6 +138,8 @@ $strEmpty = '
 $strEmptyResultSet = 'MySQL ·µ»ØµÄ²éѯ½á¹ûΪ¿Õ¡£ (Ô­Òò¿ÉÄÜΪ£ºÃ»ÓÐÕÒµ½·ûºÏÌõ¼þµÄ¼Ç¼¡£)';
 $strEnabled = 'Æô¶¯';
 $strEnd = '½áÊø';
+$strEndCut = '&#32467;§ô °Å¨ú';
+$strEndRaw = '&#32467;§ô ­ì©l&#36164;®Æ';
 $strEnglishPrivileges = ' ×¢Òâ: MySQL ȨÏÞÃû³Æ»á±»½âÊͳÉÓ¢ÎÄ ';
 $strError = '´íÎó';
 $strExplain = '˵Ã÷ SQL';
@@ -358,9 +362,14 @@ $strSize = '
 $strSort = 'ÅÅÐò';
 $strSpaceUsage = 'ÒÑʹÓÿռä';
 $strSplitWordsWithSpace = 'ÿ×éÎÄ×ÖÒÔ¿Õ¸ñ (" ") ·Ö¸ô.';
+$strSQL = 'SQL'; // should express in english
+$strSQLParserBugMessage = '&#36825;¥i¯à¬O±z§ä¨ì¤F SQL ¤À§éªº¤@¨Çµ{¦¡&#38169;&#35823;¡A&#35831;&#32454;¤ß¬d¬Ý±zªº&#35821;¥y¡A&#26816;¬d¤@¤U¤Þ�­¬O¥¿Ṳ́Î&#27809;¦³&#36951;º|¡A¨ä¥L¥i¯à¥X&#38169;ªº­ì¦]¥i¯à&#26469;¦Û±z¤W&#20256;&#26723;®×&#26102;¦b¤Þ�­¥~ªº¦a¤è¨Ï¥Î¤F¤G&#36827;¨î&#30721;¡C±z¥i¥H&#23581;&#35797;¦b MySQL ©R¥O¦C¤¶­±&#25191;¦æ&#35813;&#35821;¥y¡C¦p MySQL ¦øªA¾¹‰Y¥X&#38169;&#35823;«H®§¡A&#36825;¥i¯àûñ§U±z¥h§ä¥X&#38382;&#39064;©Ò¦b¡C¦p±z¤´µM¥¼¯à¸Ñú¨&#38382;&#39064;¡A©Î¦b¤ÀªRµ{¦¡¥X&#29616;&#38169;&#35823;¡A¦ý¦b©R¥O¦C¼Ò¦¡¯à¥¿±`&#25191;¦æ¡A&#35831;&#23558;&#35813;¥y¥X&#29616;&#38169;&#35823;ªº SQL &#35821;¥y©â¥X¡A¦}&#23558;¥H¤Uªº"°Å¨ú"³¡¥÷¤@¦P´£¥æ¨ì¯ä¦ä&#21306;:';
+$strSQLParserUserError = '¥i¯à¬O±zªº SQL &#35821;¥y¥X&#29616;&#38169;&#35823;¡A¦p MySQL ¦øªA¾¹‰Y¥X&#38169;&#35823;«H®§¡A&#36825;¥i¯àûñ§U±z¥h§ä¥X&#38382;&#39064;©Ò¦b¡C';
 $strSQLQuery = 'SQL Óï¾ä';
 $strSQLResult = 'SQL ²éѯ½á¹û';
-$strSQL = 'SQL'; // should express in english
+$strSQPBugInvalidIdentifer = 'üӮĪº&#35782;&#21035;&#30721; (Invalid Identifer)';
+$strSQPBugUnclosedQuote = '¥¼§¹&#32467;ªº¤Þ�­ (Unclosed quote)';
+$strSQPBugUnknownPunctuation = '¤£ª¾©úªº&#26631;˜ò²Å�­ (Unknown Punctuation String)';
 $strStatement = 'ÐðÊö';
 $strStrucCSV = 'CSV Êý¾Ý';
 $strStrucData = '½á¹¹ºÍÊý¾Ý';
@@ -417,21 +426,6 @@ $strWrongUser = '
 $strYes = 'ÊÇ';
 
 $strZip = '"zipped"';
+
 // To translate
-
-
-$strBeginCut = 'BEGIN CUT';  //to translate
-$strBeginRaw = 'BEGIN RAW';  //to translate
-
-$strCharsetOfFile = 'Character set of the file:'; //to translate
-
-$strEndCut = 'END CUT';  //to translate
-$strEndRaw = 'END RAW';  //to translate
-
-$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';  //to translate
-$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';  //to translate
-$strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
-$strSQPBugUnclosedQuote = 'Unclosed quote';  //to translate
-$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
-
 ?>