From d24c8a8d62caf0c0902246972a80f34edd098ba0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 17:09:25 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/res/values-zh/strings.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 4057914..9c00139 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -74,10 +74,10 @@
<string name="power_station">鐢电珯</string>
<string name="power_station_me">鎴戠殑</string>
<string name="my_power_station">鎴戠殑鐢电珯</string>
- <string name="power_station_generated_power">鍙戠數鍔熺巼:</string>
+ <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_capacity">瑁呮満瀹归噺</string>
<string name="my_power_station_connecting">杩炴帴涓�</string>
<string name="my_power_station_off_line">绂荤嚎</string>
<string name="my_power_station_malfunction">鏁呴殰</string>
@@ -245,6 +245,7 @@
<string name="deleting_please_wait">鍒犻櫎涓�,璇风◢绛夆��</string>
<string name="already_the_first_one">宸茬粡鏄涓�涓簡.</string>
<string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
+ <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0