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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9bb0a76..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>
@@ -153,7 +153,7 @@
<string name="app_version_upgrade">鐗堟湰鏇存柊</string>
<string name="app_new_version">宸茬粡鏄渶鏂扮増鏈�</string>
<string name="app_service_agreement">鐢ㄦ埛鍗忚</string>
- <string name="app_privacy_policy">闅愮鏀跨瓥</string>
+ <string name="app_privacy_policy">闅愮鍗忚</string>
<string name="app_update_now">绔嬪嵆鏇存柊</string>
<string name="app_cancel_update">鍙栨秷鏇存柊</string>
<string name="app_discover_new_version">鍙戠幇鏂扮増鏈�</string>
@@ -278,11 +278,11 @@
<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>
- <string name="grid_connected_state">骞剁綉鐘舵��</string>
+ <string name="grid_connected_state">璋冭瘯鐘舵��</string>
<string name="grid_connected">骞剁綉</string>
<string name="off_network">绂荤綉</string>
<string name="the_input_value_has_been_exceeded">杈撳叆鍊煎凡缁忚秴杩�</string>
@@ -341,4 +341,23 @@
<string name="account_not_recoverable">娉ㄩ攢璐︽埛鏄笉鍙仮澶嶇殑鎿嶄綔锛屾敞閿�璐︽埛涔嬪悗锛屾偍APP鎵�鏈夎处鎴锋暟鎹紙鍖呮嫭鏄电О銆佸ご鍍忋�佷簩缁寸爜鐓х墖绛夛級閮戒細琚垹闄わ紝涓旀棤娉曞啀鎵惧洖銆�</string>
<string name="account">璐﹀彿</string>
<string name="psw">瀵嗙爜</string>
+ <string name="battery_capacity_indicator">鐢垫睜鑳介噺</string>
+ <string name="be_debugging">璋冭瘯涓�</string>
+ <string name="debugging_completed">璋冭瘯瀹屾垚</string>
+ <string name="delivered">宸蹭氦浠�</string>
+ <string name="authorization_debugging">鎺堟潈璋冭瘯</string>
+ <string name="forbidden_login">绂佹鐧诲綍锛�</string>
+ <string name="iraq">浼婃媺鍏�</string>
+ <string name="pv">缁勪覆瀹归噺</string>
+ <string name="output">棰濆畾鍔熺巼</string>
+ <string name="day_generation">褰撴棩鍙戠數</string>
+ <string name="no_network_connection">鏃犵綉缁滆繛鎺�</string>
+ <string name="http_unknown">鏈煡缃戠粶閿欒锛岃绋嶅悗鍐嶈瘯</string>
+ <string name="network_error">缃戠粶鍙戠敓寮傚父锛岃绋嶅悗鍐嶈瘯</string>
+ <string name="parse_error">鏁版嵁瑙ｆ瀽閿欒锛岃绋嶅悗鍐嶈瘯</string>
+ <string name="ssl_error">鍔犺浇璇佷功鍑洪敊锛岃绋嶅悗鍐嶈瘯</string>
+ <string name="timeout_error">缃戠粶涓嶇粰鍔涳紝璇风◢鍚庡啀璇�</string>
+ <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