From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC

---
 HDL-ON_Android/Assets/Language.ini |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 8cabc58..1fd37ce 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -366,6 +366,11 @@
 350=閭鍦板潃涓庡綋鍓嶄竴鏍凤紝鏃犻』淇敼
 351=鎵嬫満鍙蜂笌褰撳墠涓�鏍凤紝鏃犻』淇敼
 352=妤煎眰鍒嗛厤
+353=鎷夊紑
+354=闂悎
+355=鍏充簬
+356=鐗堟湰鍙�
+357=姝ゅ姛鑳芥殏鏈紑鏀撅紒
 
 5000=闊充箰
 5001=缁勫悎
@@ -414,4 +419,59 @@
 5044=闊抽噺
 5045=鎬婚煶閲�
 5046=璋冭妭闊抽噺
+5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
+
+
+7000=鏂板缓鑷姩鍖�
+7001=缂栬緫鑷姩鍖�
+7002=濡傛灉
+7003=鍚屾椂婊¤冻浠ヤ笅鏉′欢鏃�
+7004=浠讳竴婊¤冻浠ヤ笅鏉′欢鏃�
+7005=灏辨墽琛�
+7006=浠ヤ笅鍔ㄤ綔
+7007=寰幆鏂瑰紡
+7008=鎵ц涓�娆�
+7009=姣忓ぉ
+7010=姣忓懆
+7011=姣忔湀
+7012=淇濆瓨
+7013=鎵ц鎺ㄩ��
+7014=鍙戦�侀�氱煡
+7015=閫夋嫨鏉′欢
+7016=鏃堕棿
+7017=閫夋嫨鏃堕棿鏉′欢
+7018=鏃跺埢
+7019=鏃堕棿鑼冨洿
+7020=鏃�
+7021=鍒�
+7022=绉�
+7023=鍙栨秷
+7024=纭畾
+7025=*鍦ㄦ偍鎵�璁剧疆鐨勬椂闂存鍐呭繀瀹氫細鎵ц涓�娆℃偍鎵�璁剧疆鐨勮嚜鍔ㄥ寲
+7026=寮�濮嬫椂闂�
+7027=缁撴潫鏃堕棿
+7028=鍔熻兘
+7029=閫変腑鍔熻兘鏉′欢
+7030=鍏ㄩ儴鍖哄煙
+7031=鍏ㄩ儴鍔熻兘
+7032=寮�
+7033=鍏�
+7034=寮�鍏�
+7035=瀹屾垚
+7036=娣诲姞鎵ц鍔ㄤ綔
+7037=鍛ㄤ竴
+7038=鍛ㄤ簩
+7039=鍛ㄤ笁
+7040=鍛ㄥ洓
+7041=鍛ㄤ簲
+7042=鍛ㄥ叚
+7043=鍛ㄦ棩
+7044=婊¤冻鏉′欢
+7045=璁剧疆
+7046=鍚嶇О
+7047=淇敼鍚嶇О
+7048=鑷姩鍖栧悕绉板凡瀛樺湪
+7049=鏄惁瑕佸垹闄よ嚜鍔ㄥ寲锛�
+7050=娣诲姞鍦烘櫙
+7051=寤舵椂
 

--
Gitblit v1.8.0