From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/res/values-zh/strings.xml | 68 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 92c7f71..9512341 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -74,16 +74,16 @@
<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_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>
<!--鎴戠殑-->
@@ -222,7 +222,6 @@
<string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆,璇风Щ鍔ㄦ墜鏈�10绫冲悗,鍐嶉噸鏂拌幏鍙�.</string>
<string name="succeed">鎴愬姛.</string>
-
<string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯?</string>
<string name="power_station_selection">鐢电珯閫夋嫨</string>
<string name="alarm_all_device">鍏ㄩ儴璁惧</string>
@@ -247,5 +246,64 @@
<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>
+ <string name="found_locally_firmware_upgrade_file">鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+ <string name="notify_gateway_firmware_upgrade_failed">閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+ <string name="local_service_fails">鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇.</string>
+ <string name="writing_drive_memory_succeeded">鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.</string>
+ <string name="download_drive_file_failed">涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触.</string>
+ <string name="found_locally_drive_file">鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+ <string name="notify_gateway_drive_failed">閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+ <string name="time_selectd">鏃堕棿閫夋嫨</string>
+ <string name="life_cycle">鐢熷懡鏈�</string>
+ <string name="year">骞�</string>
+ <string name="month">鏈�</string>
+ <string name="day">鏃�</string>
+ <string name="hour">鏃�</string>
+ <string name="minutc">鍒�</string>
+ <string name="seconds">绉�</string>
+ <string name="the_query_date_is_exceeded">瓒呭嚭鏌ヨ鏃ユ湡.</string>
+ <string name="energy_generation_statistics">鍙戠數閲忕粺璁�</string>
+ <string name="social_contribution">绀句細璐＄尞</string>
+ <string name="day_power_generation">褰撴棩鍙戠數閲�</string>
+ <string name="month_power_generation">褰撴湀鍙戠數閲�</string>
+ <string name="year_power_generation">褰撳勾鍙戠數閲�</string>
+ <string name="cumulative_power_generation">绱鍙戠數閲�</string>
+ <string name="generated_power">鍙戠數鍔熺巼</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="filtering">绛涢��</string>
+ <string name="reset">閲嶇疆</string>
+ <string name="string_capacity">缁勪覆瀹归噺</string>
+ <string name="grid_connected_state">骞剁綉鐘舵��</string>
+ <string name="grid_connected">骞剁綉</string>
+ <string name="off_network">绂荤綉</string>
+ <string name="the_input_value_has_been_exceeded">杈撳叆鍊煎凡缁忚秴杩�</string>
+ <string name="all_read">鍏ㄩ儴宸茶</string>
+ <string name="contact_us">鑱旂郴鎴戜滑</string>
+ <string name="wechat_id">寰俊鍙�</string>
+ <string name="email_address">閭鍦板潃</string>
+ <string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
+ <string name="to_be_added">寰呮帴鍏�</string>
+ <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
+ <string name="co_reduction_rate">CO2鍑忔帓</string>
+ <string name="quantity_of_equivalent_values">绛夋晥妞嶆爲閲�</string>
+ <string name="pv_power">鍙戠數鍔熺巼</string>
+ <string name="device_run_state">璁惧杩愯鐘舵��</string>
+ <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>
+ <string name="t">鍚�</string>
+ <string name="number">妫�</string>
+
</resources>
\ No newline at end of file
--
Gitblit v1.8.0