From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google

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

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 4db3aae..e10bcac 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -204,7 +204,7 @@
     <string name="minute">minutes</string>
     <string name="event">Events</string>
     <string name="The_gateway_cannot_be_found_locally">Unable to find gateway under local network</string>
-    <string name="welcome_to_the_smart_energy_app">Welcome to the Smart Energy APP</string>
+    <string name="welcome_to_the_smart_energy_app">Welcome to the Xenterra Solar APP</string>
     <string name="no_permissions_unable_to_receive_push">Unable to receive push notification If the permission is not enabled, you cannot receive push information</string>
     <string name="go_to_settings">Go to Settings</string>
     <string name="system_positioning_switch">You need to turn on the system positioning switch. Otherwise, the system can obtain the position information</string>
@@ -376,6 +376,7 @@
     <string name="event_time">Event time</string>
     <string name="remark">remark</string>
     <string name="treatment_options">Treatment options</string>
-    <string name="debug_status_rollback">Roll back the debugging status of "xxx" plant to debugging?</string>
+    <string name="debug_status_rollback">Roll back the debugging status of %s plant to debugging?</string>
     <string name="device_not_activated">The device is not activated</string>
+    <string name="help">Help</string>
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0