From 99240be56f0fe4b0cda451b33681bce339220b82 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期六, 11 五月 2024 14:46:09 +0800
Subject: [PATCH] Merge branch 'test' into develop_new
---
app/src/main/res/values-zh/strings.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 748a617..92c7f71 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -244,6 +244,8 @@
<string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
<string name="deleting_please_wait">鍒犻櫎涓�,璇风◢绛夆��</string>
<string name="already_the_first_one">宸茬粡鏄涓�涓簡.</string>
+ <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
+ <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0