From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'

---
 app/src/main/res/values-en/strings.xml |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index df2b923..a378ae5 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -224,7 +224,7 @@
     <string name="succeed">succeed</string>
 
     <string name="delete_power_station">Do you want to delete %s power station?</string>
-    <string name="power_station_selection">Power station selection</string>
+    <string name="power_station_selection">Solar plant list</string>
     <string name="alarm_all_device">All devices</string>
     <string name="alarm_all_device_inverter">Inverter</string>
     <string name="alarm_all_device_bms">BMS control box</string>
@@ -284,7 +284,7 @@
     <string name="filtering">Select</string>
     <string name="reset">Reset</string>
     <string name="string_capacity">String capacity</string>
-    <string name="grid_connected_state">Grid-connected state</string>
+    <string name="grid_connected_state">Debug status</string>
     <string name="grid_connected">Grid-tied</string>
     <string name="off_network">Off-grid</string>
     <string name="the_input_value_has_been_exceeded">Input value exceeded</string>
@@ -345,11 +345,21 @@
     <string name="account">Account</string>
     <string name="psw">Password</string>
 
-    <string name="battery_capacity_indicator">Battery capacity</string>
-    <string name="rated_battery_capacity">Battery capacity</string>
-    <string name="be_debugging">Be debugging</string>
+    <string name="battery_capacity_indicator">Storage</string>
+    <string name="be_debugging">Debugging in progress</string>
     <string name="debugging_completed">Debugging completed</string>
     <string name="delivered">Delivered</string>
     <string name="authorization_debugging">Authorization debugging</string>
     <string name="forbidden_login">Login prohibited!</string>
+    <string name="iraq">Iraq</string>
+    <string name="pv">PV</string>
+    <string name="output">Output</string>
+    <string name="day_generation">Generation</string>
+    <string name="no_network_connection">No network connection</string>
+
+    <string name="http_unknown">Unknown network锛宲lease try again later</string>
+    <string name="network_error">Network error, plsease try again later</string>
+    <string name="parse_error">Data parsing error, please try again later</string>
+    <string name="ssl_error">Loading certificate error, pls try again later</string>
+    <string name="timeout_error">Please check your network and try again later</string>
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0