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-en/strings.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 7abc314..658fb17 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -66,6 +66,7 @@
<string name="home_chinese_mainland">Mainland China</string>
<string name="home_password_changed_successfully_log_in">The password has been successfully changed. Please log in again.</string>
<string name="home_old_password_not_new_password">The original password and the new password should not be identical.</string>
+ <string name="home_account_registered_successfully">registered successfully.</string>
<!--鎴戠殑鐢电珯-->
@@ -241,5 +242,9 @@
<string name="alarm_record">Alarm record</string>
<string name="power_station_editing">Power station editing</string>
<string name="switch_power_station">Do you want to switch the %s power station?</string>
+ <string name="deleting_please_wait">Deleting, please wait鈥�</string>
+ <string name="already_the_first_one">It\'s already the first one</string>
+ <string name="restarting_please_wait">Restarting, please wait</string>
+ <string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0