From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath

---
 HDL-ON_iOS/Resources/Language.ini |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 7c6347f..0536c30 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -160,7 +160,7 @@
 138=浣忓畢鍚嶇О涓嶈兘涓虹┖銆�
 139=鎴块棿鍚嶇О涓嶈兘涓虹┖銆�
 140=妤煎眰鍚嶇О涓嶈兘涓虹┖銆�
-141=淇敼璇嗗埆锛屾ゼ灞傚凡缁忓瓨鍦ㄣ��
+141=淇敼澶辫触锛屾ゼ灞傚凡缁忓瓨鍦ㄣ��
 142=璁惧鍚嶇О涓嶈兘涓虹┖銆�
 143=鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖銆�
 144=鐢ㄦ埛鍚嶇О
@@ -382,6 +382,16 @@
 360=闈㈡澘鍦烘櫙
 361=鏈坊鍔�
 362=鍏ㄩ��
+363=鏃犳硶涓庢湇鍔″櫒閫氳,璁惧淇℃伅缂栬緫澶辫触銆�
+364=鏃犳硶涓庢湇鍔″櫒閫氳,鎴块棿淇℃伅缂栬緫澶辫触銆�
+365=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙淇℃伅缂栬緫澶辫触銆�
+366=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙鍒犻櫎澶辫触銆�
+367=鏃犳硶涓庢湇鍔″櫒閫氳,妤煎眰鍒犻櫎澶辫触銆�
+368=娆㈣繋浣跨敤ON+
+369=娣诲姞鏂颁綇瀹�
+370=鎴愪负瀹跺涵鎴愬憳
+371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
+372=鏃犳硶鍒涘缓鍦烘櫙锛岃缁戝畾缃戝叧
 
 5000=闊充箰
 5001=缁勫悎
@@ -548,7 +558,10 @@
 9041=绯荤粺淇℃伅
 9042=淇℃伅涓績
 9043=璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰�
-
+9044=涓婁紶鎴愬姛
+9045=涓婁紶澶辫触
+9046=淇敼鎴愬姛!
+9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
@@ -557,3 +570,13 @@
 10004=璐﹀彿宸插瓨鍦�
 10005=楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒
 10006=绛惧悕閿欒
+10007=绯荤粺绻佸繖锛岃绋嶅悗鍐嶈瘯锛�
+10008=鏃犳晥鐨勭櫥褰曞瘑鍖�
+10009=鐢ㄦ埛宸茬粡琚鐢�
+10010=鍘熷瘑鐮侀敊璇�
+10011=瀛愯处鍙峰凡缁忓瓨鍦�
+10012=瀛愯处鍙蜂笉瀛樺湪
+10013=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+10014=褰撳墠浣忓畢涓嶅睘浜庤璐﹀彿
+10015=浣忓畢鍚嶇О宸插瓨鍦�
+10016=浣忓畢涓嶅瓨鍦�
\ No newline at end of file

--
Gitblit v1.8.0