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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 750315a..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>
@@ -346,7 +346,7 @@
<string name="battery_capacity_indicator">Battery energy</string>
<string name="be_debugging">Debugging</string>
- <string name="debugging_completed">Debugged</string>
+ <string name="debugging_completed">Pending handover</string>
<string name="delivered">Delivered</string>
<string name="authorization_debugging">Re-debugging</string>
<string name="forbidden_login">Login Blocked</string>
@@ -367,8 +367,8 @@
<string name="confirm_deletion">Delete confirmation required</string>
<string name="no_network_mode_tip">Before using Offline Mode, ensure your phone and device are in the same local network. If unavailable, try belows:\n\n1. Connecting your phone to the device\'s hotspot.\n\n2. Connecting both to the same router (phone via Wi-Fi, device via LAN port with erthernet cable).</string>
<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
- <string name="simple_debugging">Simple debugging</string>
- <string name="general_debugging">General debugging</string>
+ <string name="simple_debugging">New firmware debugging</string>
+ <string name="general_debugging">Old firmware debugging</string>
<string name="event_details">Event details</string>
<string name="event_title">Event title</string>
<string name="event_content">Event content</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">Should the commissioning status of the %s power station be rolled back to commissioning?</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