From dc8ae12444d1d887394eb525e2b80dd120dc4c87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 20 二月 2024 13:43:56 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-hxb
---
app/src/main/res/values/strings.xml | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b394d48..44b93a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,9 +64,12 @@
<string name="verification">楠岃瘉鐮�</string>
<string name="home_phone_number">鍖哄彿</string>
<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="power_shome_page">棣栭〉</string>
<string name="power_station">鐢电珯</string>
<string name="power_station_me">鎴戠殑</string>
<string name="my_power_station">鎴戠殑鐢电珯</string>
@@ -79,19 +82,29 @@
<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="device_manual_connection">鎵嬪姩杩炴帴</string>
<string name="device_loading">鍔犺浇涓��</string>
- <!--娑堟伅-->
+ <!--鍛婅娑堟伅-->
<string name="message">娑堟伅</string>
- <string name="message_device_alert">璁惧璀︽姤</string>
- <string name="message_platform_push">骞冲彴鎺ㄩ��</string>
- <string name="message_device_log">璁惧鏃ュ織</string>
<string name="message_all">鍏ㄩ儴</string>
<string name="message_nascent">鍙戠敓涓�</string>
<string name="message_recover">宸叉仮澶�</string>
+ <string name="message_alarm_info">鎶ヨ璇︽儏</string>
+ <string name="message_alarm">鍛婅</string>
+ <string name="message_alarm_malfunction">鏁呴殰</string>
+ <string name="messagealarm_details_content">鎶ヨ鍐呭</string>
+ <string name="messagealarm_details_device">鎶ヨ璁惧</string>
+ <string name="message_alarm_detailsaffect_region">褰卞搷鑼冨洿</string>
+ <string name="message_alarm_detailspower_station_location">鐢电珯浣嶇疆</string>
+ <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="me">鎴戠殑</string>
@@ -184,5 +197,27 @@
<string name="apk_update_sure">璁剧疆</string>
<string name="permission_open">璇峰埌璁剧疆涓墦寮�鏉冮檺</string>
+ <string name="please_go_set_permissions">璇峰墠寰�璁剧疆鏉冮檺</string>
+ <string name="residue">鍓╀綑</string>
+ <string name="minute">鍒嗛挓</string>
+ <string name="event">浜嬩欢</string>
+ <string name="The_gateway_cannot_be_found_locally">鏈湴鎵句笉鍒扮綉鍏�</string>
+ <string name="welcome_to_the_smart_energy_app">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
+ <string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�.</string>
+ <string name="go_to_settings">鍓嶅線璁剧疆</string>
+ <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏�,鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅.</string>
+
+ <!--寮傚父-->
+ <string name="exception_unable_to_pull_up_the_cloud_upgrade_file_data">鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�</string>
+ <string name="exception_failed_to_obtain_the_md5_key_of_the_upgrade_file_on_the_cloud">鎷夸笉鍒颁簯绔笂鍗囩骇鏂囦欢md5绉橀挜</string>
+ <string name="exception_the_user_cancels_downloading_the_upgrade_file">鐢ㄦ埛鍙栨秷涓嬭浇鍗囩骇鏂囦欢.</string>
+ <string name="exception_failed_to_decrypt_the_upgrade_aes_file">鍗囩骇鏂囦欢aes瑙ｅ瘑澶辫触.</string>
+ <string name="exception_failed_to_generate_md5_for_the_upgrade_file">鍗囩骇鏂囦欢鐢熸垚md5澶辫触澶辫触.</string>
+ <string name="exception_description_failed_to_compare_the_md5_of_the_upgrade_file">鍗囩骇鏂囦欢md5姣斿澶辫触.</string>
+ <string name="exception_the_upgrade_file_is_downloaded">鍗囩骇鏂囦欢涓嬭浇瀹屾垚.</string>
+ <string name="exception_no_location_information_permission">娌℃湁浣嶇疆淇℃伅鏉冮檺.</string>
+ <string name="exception_the_location_function_is_not_enabled">娌″紑鍚畾浣嶅姛鑳�.</string>
+ <string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆,璇风Щ鍔ㄦ墜鏈�10绫冲悗,鍐嶉噸鏂拌幏鍙�.</string>
+ <string name="succeed">鎴愬姛.</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0