From f2d122dc78c58925a05d770d716e7fefcbd784ef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 11:09:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

---
 HDL-ON_iOS/Resources/Language.ini |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index eb71aaa..bfd5718 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -395,9 +395,11 @@
 373=娣诲姞妤煎眰澶辫触銆�
 374=浣忓畢鏁版嵁宸茶鍒犻櫎锛孉PP灏嗚嚜鍔ㄥ垏鎹㈠埌鍙︿竴浣忓畢銆�
 375=缃戝叧鏈繛鎺ユ湇鍔″櫒锛屾棤娉曞垱寤哄満鏅��
-376=娆㈣繋鍥炲
-377=浜岀淮鐮佸け鏁堬紝璇烽噸璇�
-378=閲嶈瘯
+376=鏃犳硶杈撳叆鐗规畩瀛楃.
+377=鍏ㄥ畢鍖哄煙
+400=娆㈣繋鍥炲
+401=浜岀淮鐮佸け鏁堬紝璇烽噸璇�
+402=閲嶈瘯
 
 5000=闊充箰
 5001=缁勫悎
@@ -518,6 +520,8 @@
 7066=绂诲紑
 7067=涓�鑸�
 7068=鏃堕棿
+7069=鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
+7070=姝ゅ绌虹┖濡備篃~
 
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
@@ -572,6 +576,10 @@
 9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
 9050=楠岃瘉闈㈠ID
 9051=淇濆瓨鐢ㄦ埛澶村儚澶辫触
+9052=鎺ㄩ�佹敞鍐屾甯�
+9053=鎺ㄩ�佹敞鍐屽紓甯�
+9054=鏁板瓧瀵嗙爜楠岃瘉
+9055=缁樺埗鎵嬪娍楠岃瘉
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒

--
Gitblit v1.8.0