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-zh/strings.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index ad01087..9512341 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -77,7 +77,7 @@
     <string name="power_station_generated_power">鍙戠數鍔熺巼</string>
     <string name="power_station_Power_generation_today">浠婃棩鍙戠數</string>
     <string name="power_station_creation_time">鍒涘缓鏃堕棿</string>
-    <string name="my_power_station_installed_capacity">瑁呮満瀹归噺</string>
+    <string name="my_power_station_installed_capacity1">瑁呮満瀹归噺</string>
     <string name="my_power_station_connecting">杩炴帴涓�</string>
     <string name="my_power_station_off_line">绂荤嚎</string>
     <string name="my_power_station_malfunction">鏁呴殰</string>
@@ -272,7 +272,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>
@@ -281,7 +280,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