From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7b0e86..a25c6a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,7 +21,7 @@
     <string name="home_login_input_psw">璇疯緭鍏ュ瘑鐮�</string>
     <string name="home_login_register">娉ㄥ唽</string>
     <string name="home_login_forget_password">蹇樿瀵嗙爜</string>
-    <string name="home_login_change_password">淇敼瀵嗙爜</string>
+    <string name="home_login_change_password">瀵嗙爜淇敼</string>
     <string name="home_login_logoin">鐧诲綍</string>
     <string name="home_login_be_logging_in">鐧诲綍涓��</string>
     <string name="home_login_power_station">浣撻獙鐢电珯</string>
@@ -60,7 +60,7 @@
     <string name="home_login_input_new_pws">璇疯緭鍏ユ柊瀵嗙爜</string>
     <string name="home_login_input_affirm_psw">璇峰啀娆¤緭鍏ユ柊瀵嗙爜</string>
     <string name="home_login_input_unlike_psw">鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鑷�.</string>
-    <string name="home_login_change_name_succeed">淇敼澶囨敞鎴愬姛.</string>
+    <string name="home_login_change_name_succeed">淇敼鎴愬姛</string>
     <string name="verification">楠岃瘉鐮�</string>
     <string name="home_phone_number">鍖哄彿</string>
     <string name="home_chinese_mainland">涓浗澶ч檰</string>
@@ -70,7 +70,7 @@
 
 
     <!--鎴戠殑鐢电珯-->
-    <string name="power_shome_page">棣栭〉</string>
+    <string name="power_home_page">棣栭〉</string>
     <string name="power_station">鐢电珯</string>
     <string name="power_station_me">鎴戠殑</string>
     <string name="my_power_station">鎴戠殑鐢电珯</string>
@@ -118,7 +118,7 @@
     <string name="set_push_notification">鎺ㄩ�佹秷鎭�</string>
     <string name="set_alarm_message">鎶ヨ娑堟伅</string>
     <string name="set_general_setting">閫氱敤璁剧疆</string>
-    <string name="set_multilingual">澶氳瑷�</string>
+    <string name="set_multilingual">璇█</string>
     <string name="set_data_centre">鏁版嵁涓績</string>
     <string name="set_system_rights_managemen">绯荤粺鏉冮檺绠$悊</string>
     <string name="set_3_msg_sharing">绗笁鏂逛俊鎭叡浜竻鍗�</string>

--
Gitblit v1.8.0