From 276156837ebca8b8b08a516e61fe105e670375fc Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 04 六月 2024 10:35:23 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.1
---
app/src/main/res/values-en/strings.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 3eae335..635e3f8 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -77,7 +77,7 @@
<string name="power_station_generated_power">Power generation</string>
<string name="power_station_Power_generation_today">Today power generation</string>
<string name="power_station_creation_time">Established at</string>
- <string name="my_power_station_installed_capacity">Installed capacity</string>
+ <string name="my_power_station_installed_capacity1">Installed capacity</string>
<string name="my_power_station_connecting">Connecting</string>
<string name="my_power_station_off_line">Offline</string>
<string name="my_power_station_malfunction">Malfunction</string>
@@ -104,7 +104,7 @@
<string name="message_alarm_details_time">Alarm time</string>
<string name="message_alarm_details_back">Back</string>
<string name="message_alarm_details_resolved">Solved</string>
- <string name="message_alarm_data_null">No alarm</string>
+ <string name="message_alarm_data_null">No alarm!</string>
<!--鎴戠殑-->
@@ -274,7 +274,6 @@
<string name="year_power_generation">褰撳勾鍙戠數閲�</string>
<string name="cumulative_power_generation">绱鍙戠數閲�</string>
<string name="generated_power">鍙戠數鍔熺巼</string>
- <string name="installed_capacity">瑁呮満瀹归噺</string>
<string name="generation">鍙戠數閲�</string>
<string name="station_name">鐢电珯鍚嶇О</string>
<string name="search">鎼滅储</string>
@@ -283,7 +282,7 @@
<string name="no_equipment">鏆傛棤璁惧.</string>
<string name="filtering">绛涢��</string>
<string name="reset">閲嶇疆</string>
- <string name="string_capacity">缁勪覆瀹归噺锛坘Wp)</string>
+ <string name="string_capacity">缁勪覆瀹归噺</string>
<string name="grid_connected_state">骞剁綉鐘舵��</string>
<string name="grid_connected">骞剁綉</string>
<string name="off_network">绂荤綉</string>
--
Gitblit v1.8.0