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-zh/strings.xml | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 1653474..a574169 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -12,7 +12,7 @@
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
<!--鐧诲綍妯″潡-->
- <string name="home_login_chinese">涓枃锛堢畝浣擄級</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>
@@ -61,9 +61,15 @@
<string name="home_login_input_affirm_psw">璇峰啀娆¤緭鍏ユ柊瀵嗙爜</string>
<string name="home_login_input_unlike_psw">鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鑷�.</string>
<string name="home_login_change_name_succeed">淇敼澶囨敞鎴愬姛.</string>
+ <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>
@@ -76,16 +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>
@@ -102,13 +121,53 @@
<string name="set_data_centre">鏁版嵁涓績</string>
<string name="set_system_rights_managemen">绯荤粺鏉冮檺绠＄悊</string>
<string name="set_3_msg_sharing">绗笁鏂逛俊鎭叡浜竻鍗�</string>
+ <string name="set_account_security">璐﹀彿涓庡畨鍏�</string>
+ <string name="set_temperature_unit">娓╁害鍗曚綅</string>
<string name="set_logout">閫�鍑虹櫥褰�</string>
<string name="set_privacy">闅愮璁剧疆</string>
<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_portrait">澶村儚</string>
+ <string name="me_personal_data_user_name">鐢ㄦ埛鍚�</string>
+ <string name="me_personal_data_role">瑙掕壊</string>
+ <string name="me_personal_data_super_admin">瓒呯骇绠＄悊鍛�</string>
+ <string name="me_personal_data_photograph">鎷嶇収</string>
+ <string name="me_personal_data_select_album">浠庣浉鍐屼腑閫夋嫨</string>
+ <string name="set_email_address">鐢靛瓙閭</string>
+ <string name="set_not_bind">鏈粦瀹�</string>
+ <string name="set_language_choice">璇█閫夋嫨</string>
+ <string name="set_c">鈩�(鎽勬皬搴�)</string>
+ <string name="set_f">鈩�(鍗庢皬搴�)</string>
+ <string name="set_change_bind_phone_number">淇敼鎵嬫満鍙风爜</string>
+ <string name="set_change_bind_mail">淇敼閭鍦板潃</string>
+ <string name="set_bind_phone_succeed">缁戝畾鎵嬫満鍙锋垚鍔�.</string>
+ <string name="set_bind_mail_succeed">缁戝畾閭鎴愬姛.</string>
+
+
+ <!--app鏇存柊-->
+ <string name="app_version_number">鐗堟湰鍙�</string>
+ <string name="app_scan_code_download">鎵爜涓嬭浇鏅烘収鑳芥簮APP</string>
+ <string name="app_version_upgrade">鐗堟湰鏇存柊</string>
+ <string name="app_new_version">宸茬粡鏄渶鏂扮増鏈�</string>
+ <string name="app_service_agreement">鏈嶅姟鍗忚</string>
+ <string name="app_privacy_policy">闅愮鏀跨瓥</string>
+ <string name="app_update_now">绔嬪嵆鏇存柊</string>
+ <string name="app_cancel_update">鍙栨秷鏇存柊</string>
+ <string name="app_discover_new_version">鍙戠幇鏂扮増鏈�</string>
+ <string name="app_be_updating">姝ｅ湪鏇存柊</string>
+ <string name="app_stop_current_download">鏄惁鍋滄褰撳墠涓嬭浇锛�</string>
+ <string name="app_version">鐗堟湰</string>
+ <string name="app_package_size">澶у皬</string>
+ <string name="app_update_content">涓轰簡姝ｅ父鍗囩骇娌充笢APP锛岃鐐瑰嚮璁剧疆鎸夐挳锛屽厑璁稿畨瑁呮湭鐭ユ潵婧愬簲鐢紝鏈姛鑳藉彧闄愮敤浜庢渤涓淎PP鐗堟湰鍗囩骇锛孉ndroid 11鐗堟湰鍙婁互涓婇渶瑕佸湪鎺堟潈涔嬪悗閲嶆柊涓嬭浇瀹夎銆�</string>
+ <string name="app_update_fail">鎺堟潈澶辫触锛屾棤娉曞畨瑁呭簲鐢�</string>
<!--ota-->
<string name="ota_binding_cloud_upgrade_fails">閫嗗彉鍣ㄦ病缁戝畾杩�,鍗囩骇澶辫触.</string>
- <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病涓婁簯,鍗囩骇澶辫触.</string>
+ <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病杩炰笂浜�,鍗囩骇澶辫触.</string>
+
+
<!--uin-->
<string name="uni_open_error">椤甸潰鍒濆鍖栦腑 璇风瓑寰�5绉掑啀鐐瑰嚮</string>
@@ -120,6 +179,47 @@
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
<string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
+ <string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔.</string>
+ <string name="loading_title_tip">鎻愮ず</string>
+ <string name="loading_app_restart">纭鍚嶢pp灏嗕細閲嶆柊鍚姩.</string>
+ <string name="loading_log_out">纭閫�鍑虹櫥褰�?</string>
+
+
+ <!-- 鏉冮檺 -->
+ <string name="camera_album_file_create_fial">鏂囦欢鍒涘缓澶辫触</string>
+ <string name="camera_album_file_save_fial">淇濆瓨璺緞寮傚父锛岃閲嶈瘯</string>
+ <!-- 鏉冮檺 -->
+
+ <!-- 鍥剧墖涓婁紶 -->
+ <string name="camera_album_file_get_fial">鍥剧墖鑾峰彇澶辫触</string>
+ <string name="camera_album_system_fial">绯荤粺澶勭悊鍥剧墖澶辫触锛岃閲嶈瘯</string>
+ <string name="apk_update_content">涓轰簡姝ｅ父鍗囩骇娌充笢APP锛岃鐐瑰嚮璁剧疆鎸夐挳锛屽厑璁稿畨瑁呮湭鐭ユ潵婧愬簲鐢紝鏈姛鑳藉彧闄愮敤浜庢渤涓淎PP鐗堟湰鍗囩骇锛孉ndroid 11鐗堟湰鍙婁互涓婇渶瑕佸湪鎺堟潈涔嬪悗閲嶆柊涓嬭浇瀹夎銆�</string>
+ <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