From 989b4cf5a84e898e9682f8d9723a8ba1ff20c23b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 16:55:57 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc

---
 app/src/main/res/values/strings.xml |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 750d136..d81d43a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="home_login_娉ㄥ唽">娉ㄥ唽</string>
     <string name="home_login_蹇樿瀵嗙爜">蹇樿瀵嗙爜</string>
     <string name="home_login_鐧诲綍">鐧诲綍</string>
+    <string name="home_login_鐧诲綍涓�">鐧诲綍涓��</string>
     <string name="home_login_浣撻獙鐢电珯">浣撻獙鐢电珯</string>
     <string name="home_login_鍚屾剰_鏈嶅姟鍗忚">鍚屾剰銆婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��</string>
     <string name="home_login_error_璐﹀彿涓嶈兘涓虹┖">璐﹀彿涓嶈兘涓虹┖.</string>
@@ -42,7 +43,10 @@
     <string name="my_power_station_绂荤嚎">绂荤嚎</string>
     <string name="my_power_station_鏁呴殰">鏁呴殰</string>
     <string name="my_power_station_杩愯">杩愯</string>
+
+    <!--璁惧-->
     <string name="device_鎵嬪姩杩炴帴">鎵嬪姩杩炴帴</string>
+    <string name="device_鍔犺浇涓�">鍔犺浇涓��</string>
 
 
     <!--鎴戠殑-->
@@ -50,5 +54,12 @@
     <string name="me_璁剧疆">璁剧疆</string>
     <string name="me_鍏充簬">鍏充簬</string>
 
+    <!--uin-->
+    <string name="uni_open_error">椤甸潰鍒濆鍖栦腑 璇风瓑寰�5绉掑啀鐐瑰嚮</string>
+
+    <!--寮规-->
+    <string name="loading_鍙栨秷">鍙栨秷</string>
+    <string name="loading_纭">纭</string>
+
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0