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-en/strings.xml | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 19c713a..635e3f8 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -66,6 +66,7 @@
<string name="home_chinese_mainland">Mainland China</string>
<string name="home_password_changed_successfully_log_in">The password has been successfully changed. Please log in again.</string>
<string name="home_old_password_not_new_password">The original password and the new password should not be identical.</string>
+ <string name="home_account_registered_successfully">registered successfully.</string>
<!--鎴戠殑鐢电珯-->
@@ -73,10 +74,10 @@
<string name="power_station">Power station</string>
<string name="power_station_me">Mine</string>
<string name="my_power_station">My power station</string>
- <string name="power_station_generated_power">Power generation:</string>
+ <string name="power_station_generated_power">Power generation</string>
<string name="power_station_Power_generation_today">Today power generation</string>
<string name="power_station_creation_time">Established at</string>
- <string name="my_power_station_installed_capacity">Installed capacity:</string>
+ <string name="my_power_station_installed_capacity1">Installed capacity</string>
<string name="my_power_station_connecting">Connecting</string>
<string name="my_power_station_off_line">Offline</string>
<string name="my_power_station_malfunction">Malfunction</string>
@@ -103,7 +104,7 @@
<string name="message_alarm_details_time">Alarm time</string>
<string name="message_alarm_details_back">Back</string>
<string name="message_alarm_details_resolved">Solved</string>
- <string name="message_alarm_data_null">No alarm</string>
+ <string name="message_alarm_data_null">No alarm!</string>
<!--鎴戠殑-->
@@ -219,6 +220,91 @@
<string name="exception_the_upgrade_file_is_downloaded">The upgrade file is downloaded.</string>
<string name="exception_no_location_information_permission">No location information permission.</string>
<string name="exception_the_location_function_is_not_enabled">The location function is not enabled.</string>
+ <string name="exception_unable_location_move10_meters_later">Unable to get the location, please move the phone 10 meters later, and then get again.</string>
<string name="succeed">succeed.</string>
+ <string name="delete_power_station">Do you want to delete %s power station?</string>
+ <string name="power_station_selection">Power station selection</string>
+ <string name="alarm_all_device">All devices</string>
+ <string name="alarm_all_device_inverter">inverter</string>
+ <string name="alarm_all_device_bms">BMS control box</string>
+ <string name="alarm_all_device_battery_cell">Battery unit</string>
+ <string name="alarm_all_grade">All grades</string>
+ <string name="alarm_all_grade_malfunction">malfunction</string>
+ <string name="alarm_all_grade_warning">warning</string>
+ <string name="alarm_all_grade_tip">hint</string>
+ <string name="alarm_all_time">All time</string>
+ <string name="alarm_all_time_same_day">the day</string>
+ <string name="alarm_all_time_3">Last 3 Days</string>
+ <string name="alarm_all_time_7">Last 7 Days</string>
+ <string name="alarm_all_time_30">Last 30 Days</string>
+ <string name="alarm_device">Equipment alarm</string>
+ <string name="alarm_record">Alarm record</string>
+ <string name="power_station_editing">Power station editing</string>
+ <string name="switch_power_station">Do you want to switch the %s power station?</string>
+ <string name="deleting_please_wait">Deleting, please wait鈥�</string>
+ <string name="already_the_first_one">It\'s already the first one</string>
+ <string name="restarting_please_wait">Restarting, please wait</string>
+ <string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</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">t</string>
+ <string name="number"></string>
+
</resources>
\ No newline at end of file
--
Gitblit v1.8.0