From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'

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

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 7102bb9..af2742b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -66,7 +66,7 @@
     <string name="home_chinese_mainland">涓浗</string>
     <string name="home_password_changed_successfully_log_in">瀵嗙爜淇敼鎴愬姛锛屽皢閲嶆柊鐧诲綍銆�</string>
     <string name="home_old_password_not_new_password">鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍枫��</string>
-    <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛銆�</string>
+    <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛</string>
 
 
     <!--鎴戠殑鐢电珯-->
@@ -83,7 +83,7 @@
     <string name="my_power_station_malfunction">鏁呴殰</string>
     <string name="my_power_station_operation">杩愯</string>
     <string name="my_power_station_await">寰呮満</string>
-    <string name="my_power_station_data_null">鏆傛棤鐢电珯!</string>
+    <string name="my_power_station_data_null">鏆傛棤鐢电珯</string>
 
     <!--璁惧-->
     <string name="device_manual_connection">鎵嬪姩杩炴帴</string>
@@ -278,7 +278,7 @@
     <string name="search">鎼滅储</string>
     <string name="history_search">鍘嗗彶鎼滅储</string>
     <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖</string>
-    <string name="no_equipment">鏆傛棤璁惧!</string>
+    <string name="no_equipment">鏆傛棤璁惧</string>
     <string name="filtering">绛涢��</string>
     <string name="reset">閲嶇疆</string>
     <string name="string_capacity">缁勪覆瀹归噺</string>
@@ -357,5 +357,7 @@
     <string name="parse_error">鏁版嵁瑙f瀽閿欒锛岃绋嶅悗鍐嶈瘯</string>
     <string name="ssl_error">鍔犺浇璇佷功鍑洪敊锛岃绋嶅悗鍐嶈瘯</string>
     <string name="timeout_error">缃戠粶涓嶇粰鍔涳紝璇风◢鍚庡啀璇�</string>
-    v
+    <string name="signature_error_log_in_again">绛惧悕閿欒,閲嶆柊鐧诲綍</string>
+    <string name="Device_failed_to_certificate">鏌ヨ璁惧璁よ瘉澶辫触</string>
+
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0