From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/values/strings.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a8d623..a9443b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -301,4 +301,8 @@
<string name="search_station">鎼滅储鐢电珯</string>
<string name="enter_the_device_sn_and_device_name">杈撳叆璁惧SN鍙�/璁惧鍚嶇О</string>
<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