From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 19:35:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath

---
 HDL-ON_iOS/Resources/Language.ini |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c186fae..0ca9301 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -390,6 +390,8 @@
 368=娆㈣繋浣跨敤ON+
 369=娣诲姞鏂颁綇瀹�
 370=鎴愪负瀹跺涵鎴愬憳
+371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
+372=鏃犳硶鍒涘缓鍦烘櫙锛岃缁戝畾缃戝叧
 
 5000=闊充箰
 5001=缁勫悎
@@ -555,11 +557,12 @@
 9040=鎶ヨ绫�
 9041=绯荤粺淇℃伅
 9042=淇℃伅涓績
-9043=璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰�
+9043=鎮ㄧ殑璐﹀彿宸插湪鍒鐧诲綍锛屽鏋滀笉鏄偍鏈汉鎿嶄綔锛岃绔嬪嵆淇敼瀵嗙爜锛�
 9044=涓婁紶鎴愬姛
 9045=涓婁紶澶辫触
 9046=淇敼鎴愬姛!
 9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
+9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒

--
Gitblit v1.8.0