From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/res/values/strings.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8f526f..b11bfa3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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,13 @@
<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>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0