From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/res/values/strings.xml | 100 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 93 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 99f8730..b7b0e86 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 -->
@@ -11,11 +10,12 @@
<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>
<string name="home_login_hdl_stored_energy">HDL鍏変紡鍌ㄨ兘</string>
<string name="home_login_an_installer">鎴戞槸瀹夎鍟�</string>
- <string name="home_login__input_phone_email">璇疯緭鍏ユ墜鏈哄彿/閭鍙�</string>
+ <string name="home_login_input_phone_email">璇疯緭鍏ユ墜鏈哄彿/閭鍙�</string>
<string name="home_login_input_phone">璇疯緭鍏ユ墜鏈哄彿</string>
<string name="home_login_email_address">閭鍙�</string>
<string name="home_login_input_psw">璇疯緭鍏ュ瘑鐮�</string>
@@ -66,6 +66,7 @@
<string name="home_chinese_mainland">涓浗澶ч檰</string>
<string name="home_password_changed_successfully_log_in">瀵嗙爜淇敼鎴愬姛,灏嗛噸鏂扮櫥褰�.</string>
<string name="home_old_password_not_new_password">鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍�.</string>
+ <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛.</string>
<!--鎴戠殑鐢电珯-->
@@ -73,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>
@@ -103,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>
<!--鎴戠殑-->
@@ -128,7 +129,7 @@
<string name="set_nickname_modification">鏄电О淇敼</string>
<string name="set_user_management">鐢ㄦ埛绠＄悊</string>
<string name="set_message_center">娑堟伅涓績</string>
- <string name="me_personal_data">涓汉璧勬枡</string>
+ <string name="me_personal_data">涓汉淇℃伅</string>
<string name="me_personal_data_portrait">澶村儚</string>
<string name="me_personal_data_user_name">鐢ㄦ埛鍚�</string>
<string name="me_personal_data_role">瑙掕壊</string>
@@ -240,6 +241,91 @@
<string name="alarm_record">鎶ヨ璁板綍</string>
<string name="power_station_editing">鐢电珯缂栬緫</string>
<string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
+ <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>
+
+
+
+ <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>
+ <string name="device_off">璁惧宸茬绾�!</string>
+ <string name="summarize">姒傝</string>
+ <string name="qr_code_business_card">浜岀淮鐮佸悕鐗�</string>
+ <string name="save_qr_code_successfully">淇濆瓨浜岀淮鐮佹垚鍔�.</string>
+ <string name="failed_to_save_qr_code">淇濆瓨浜岀淮鐮佸け璐�.</string>
+ <string name="staff_management">鍛樺伐绠＄悊</string>
+ <string name="alarm">鎶ヨ</string>
+ <string name="add_power_station">娣诲姞鐢电珯</string>
+ <string name="add_power_station_failing">娣诲姞鐢电珯澶辫触.</string>
+ <string name="add_power_station_succeed">娣诲姞鐢电珯鎴愬姛.</string>
+
+ <!--鎵爜-->
+ <string name="scan_title">浜岀淮鐮佹壂鎻�</string>
+ <string name="zxing_scan_tips">灏嗕簩缁寸爜鏀惧叆妗嗗唴锛屽嵆鍙嚜鍔ㄦ壂鎻�</string>
+ <string name="capture_no_camera">娌℃湁璁块棶鐩告満鐨勬潈闄愶紝璇锋墦寮�璁块棶鏉冮檺鍐嶈瘯</string>
+ <string name="capture_no_result">娌℃湁鎵弿鍑虹粨鏋�</string>
+ <string name="capture_no_network">褰撳墠缃戠粶涓嶅彲鐢�,璇锋鏌ョ綉缁滃悗鍐嶈瘯</string>
+ <string name="capture_no_result2">娌℃湁鎵弿鍑虹粨鏋滐紝鍙兘涓嶆槸鏈夋晥鐨勪簩缁寸爜</string>
+ <string name="scan_cancel">鍙栨秷</string>
+ <string name="not_delivery_qr_code">涓嶆槸浜や粯浜岀淮鐮�.</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0