From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1040a1..25aab6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,6 +195,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 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>
@@ -367,11 +368,13 @@
     <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>
-    <string name="notification_settings">Notification settings</string>
+    <string name="open_notification_settings">Notification settings</string>
     <string name="go_and_start">Go and start</string>
     <string name="notification_alert">Notification alert</string>
     <string name="ai_butler_message">AI butler message</string>
     <string name="app_name_title">Xenterra Solar</string>
     <string name="or">OR</string>
     <string name="re_commissioning_power_station">The Xenterra app initiates the re-commissioning of the power station</string>
+    <string name="notification_settings">Notification settings</string>
+    <string name="host_process_service_channel">Host process service channel</string>
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0