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/strings.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae83604..c8f526f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,13 +77,13 @@
<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>
<string name="my_power_station_operation">杩愯</string>
<string name="my_power_station_await">寰呮満</string>
- <string name="my_power_station_data_null">鏁版嵁涓虹┖,璧跺揩鍒涘缓涓�涓惂!</string>
+ <string name="my_power_station_data_null">鏆傛棤鐢电珯!</string>
<!--璁惧-->
<string name="device_manual_connection">鎵嬪姩杩炴帴</string>
@@ -104,7 +104,7 @@
<string name="message_alarm_details_time">鎶ヨ鏃堕棿</string>
<string name="message_alarm_details_back">杩斿洖</string>
<string name="message_alarm_details_resolved">宸茶В鍐�</string>
- <string name="message_alarm_data_null">鏆傛棤鎶ヨ</string>
+ <string name="message_alarm_data_null">鏆傛棤鎶ヨ!</string>
<!--鎴戠殑-->
@@ -246,7 +246,6 @@
<string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
<string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
-
<string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
<string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
<string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string>
@@ -273,16 +272,15 @@
<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>
<string name="history_search">鍘嗗彶鎼滅储</string>
<string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
- <string name="no_equipment">鏆傛棤璁惧.</string>
+ <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>
@@ -307,5 +305,6 @@
<string name="t">鍚�</string>
<string name="number">妫�</string>
<string name="device_off">璁惧宸茬绾�!</string>
+ <string name="summarize">姒傝</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0