From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73aa1ac..ac5e0c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -371,10 +371,14 @@
     <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="event_details">Event details</string>
     <string name="event_title">Event title</string>
     <string name="event_content">Event content</string>
+    <string name="event_device">Event device</string>
+    <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="device_not_activated">The device is not activated</string>
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0