From 828f4428e64e0141408b47d8b56b28e0cf301888 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:20:47 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new
---
app/src/main/res/values/strings.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db6b61a..a9443b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -303,5 +303,6 @@
<string name="enter_alarm_name">杈撳叆鎶ヨ鍚嶇О</string>
<string name="device">璁惧</string>
<string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
+ <string name="active_power">鏈夊姛鍔熺巼</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0