From 31de722a45e886eae89cfea2f1740c1f4d3b0216 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 15:22:34 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.1
---
app/src/main/res/values/strings.xml | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02a7e84..f08de17 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
<resources>
- <!-- <string name="app_name">PhotovoltaicDebug</string>-->
<string name="app_name">鏅烘収鑳芥簮</string>
<string name="title_activity_home_login">HomeLoginActivity</string>
<!-- Strings used for fragments for navigation -->
@@ -10,6 +9,7 @@
<string name="hello_first_fragment">Hello first fragment</string>
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+
<!--鐧诲綍妯″潡-->
<string name="home_login_chinese">绠�浣撲腑鏂�</string>
@@ -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>
<!--鎴戠殑-->
@@ -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,20 +272,40 @@
<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>
<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>
+ <string name="device_off">璁惧宸茬绾�!</string>
+ <string name="summarize">姒傝</string>
+ <string name="qr_code_business_card">浜岀淮鐮佸悕鐗�</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0