Merged fixed name from STABLE

diff --git a/lang/zh_cn/moodle.php b/lang/zh_cn/moodle.php
index 2ed5d45c3c6959fddbb5c3be6247ee2f6d369795..5ed3720fcaa200e84c293efadcde74a3471c5681 100755 (executable)
--- a/lang/zh_cn/moodle.php
+++ b/lang/zh_cn/moodle.php
@@ -813,7 +813,7 @@ $string['themes'] = '
 $string['themesaved'] = 'ÐÂÖ÷Ìâ·ç¸ñÒѱ£´æ';
 $string['thischarset'] = 'GB18030';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = '英文';
+$string['thislanguage'] = '中文';
 $string['time'] = 'ʱ¼ä';
 $string['timezone'] = 'ʱÇø';
 $string['to'] = 'µ½';