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 | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8f526f..b7b0e86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
<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>
@@ -129,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>
@@ -246,6 +246,8 @@
<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>
@@ -306,5 +308,24 @@
<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