From 0b357bcd7c472c91227093239f180a28638c57a4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:33:07 +0800
Subject: [PATCH] Merge branch '1.5.2' into 1.5.1_google

---
 app/src/main/res/values-zh/strings.xml |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a8a69ec..c76d166 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -282,7 +282,7 @@
     <string name="filtering">绛涢��</string>
     <string name="reset">閲嶇疆</string>
     <string name="string_capacity">缁勪覆瀹归噺</string>
-    <string name="grid_connected_state">骞剁綉鐘舵��</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>
@@ -330,9 +330,32 @@
     <string name="radio">姣旂巼</string>
     <string name="min">鏈�灏忓��</string>
     <string name="max">鏈�澶у��</string>
+    <string name="camera_storage_instructions">鐩告満銆佸瓨鍌ㄦ潈闄愪娇鐢ㄨ鏄庯細</string>
+    <string name="camera_storage_purpose">鐢ㄤ簬鎵爜銆佹媿鐓с�佷粠鐩稿唽涓婁紶鍥剧墖銆佽鍐欒澶囦笂鐨勭収鐗囩瓑鍦烘櫙</string>
+    <string name="set_location_permissions">璇峰墠寰�璁剧疆鎵撳紑浣嶇疆鏉冮檺</string>
     <string name="agree">鍚屾剰</string>
     <string name="user_agreement_and_privacy_agreement">鐢ㄦ埛鍗忚鍜岄殣绉佸崗璁�</string>
     <string name="thank_you_for_using">鎰熻阿鎮ㄤ娇鐢ㄦ柊鐗归攼鑳� App锛屽湪鎮ㄤ娇鐢ㄨ繃绋嬩腑锛屾垜浠彲鑳戒細瀵规偍鐨勯儴鍒嗕釜浜轰俊鎭繘琛屾敹闆嗐�佷娇鐢�,璇锋偍浠旂粏闃呰銆婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁�嬶紝骞剁‘瀹氬畬鍏ㄤ簡瑙f垜浠鎮ㄤ釜浜轰俊鎭殑澶勭悊瑙勫垯銆傚鎮ㄥ悓鎰忕敤鎴峰崗璁拰闅愮鍗忚锛岃鐐瑰嚮鈥滃悓鎰忊�濓紝寮�濮嬩娇鐢ㄦ柊鐗归攼鑳� App銆�</string>
-
-
+    <string name="confirm_account">纭娉ㄩ攢鏀硅处鍙峰悧锛�</string>
+    <string name="immediate_cancellation">绔嬪嵆娉ㄩ攢</string>
+    <string name="account_not_recoverable">娉ㄩ攢璐︽埛鏄笉鍙仮澶嶇殑鎿嶄綔锛屾敞閿�璐︽埛涔嬪悗锛屾偍APP鎵�鏈夎处鎴锋暟鎹紙鍖呮嫭鏄电О銆佸ご鍍忋�佷簩缁寸爜鐓х墖绛夛級閮戒細琚垹闄わ紝涓旀棤娉曞啀鎵惧洖銆�</string>
+    <string name="account">璐﹀彿</string>
+    <string name="psw">瀵嗙爜</string>
+    <string name="battery_capacity_indicator">鐢垫睜鑳介噺</string>
+    <string name="be_debugging">璋冭瘯涓�</string>
+    <string name="debugging_completed">璋冭瘯瀹屾垚</string>
+    <string name="delivered">宸蹭氦浠�</string>
+    <string name="authorization_debugging">鎺堟潈璋冭瘯</string>
+    <string name="forbidden_login">绂佹鐧诲綍锛�</string>
+    <string name="iraq">浼婃媺鍏�</string>
+    <string name="pv">缁勪覆瀹归噺</string>
+    <string name="output">棰濆畾鍔熺巼</string>
+    <string name="day_generation">褰撴棩鍙戠數</string>
+    <string name="no_network_connection">鏃犵綉缁滆繛鎺�</string>
+    <string name="http_unknown">鏈煡缃戠粶閿欒锛岃绋嶅悗鍐嶈瘯</string>
+    <string name="network_error">缃戠粶鍙戠敓寮傚父锛岃绋嶅悗鍐嶈瘯</string>
+    <string name="parse_error">鏁版嵁瑙f瀽閿欒锛岃绋嶅悗鍐嶈瘯</string>
+    <string name="ssl_error">鍔犺浇璇佷功鍑洪敊锛岃绋嶅悗鍐嶈瘯</string>
+    <string name="timeout_error">缃戠粶涓嶇粰鍔涳紝璇风◢鍚庡啀璇�</string>
+    v
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0