From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'
---
app/src/main/res/values-en/strings.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index b4556eb..51dead0 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -60,7 +60,7 @@
<string name="home_login_input_new_pws">Please enter your new password</string>
<string name="home_login_input_affirm_psw">Please enter your new password again</string>
<string name="home_login_input_unlike_psw">New password and confirm password are different</string>
- <string name="home_login_change_name_succeed">Remark successfully updated.</string>
+ <string name="home_login_change_name_succeed">successfully updated</string>
<string name="verification">Verification code</string>
<string name="home_phone_number">Country Code</string>
<string name="home_chinese_mainland">Mainland China</string>
@@ -70,7 +70,7 @@
<!--鎴戠殑鐢电珯-->
- <string name="power_shome_page">Homepage</string>
+ <string name="power_home_page">Home</string>
<string name="power_station">Plants</string>
<string name="power_station_me">Me</string>
<string name="my_power_station">My Plants</string>
@@ -80,7 +80,7 @@
<string name="my_power_station_installed_capacity1">Installed capacity</string>
<string name="my_power_station_connecting">Connecting</string>
<string name="my_power_station_off_line">Offline</string>
- <string name="my_power_station_malfunction">Faulty</string>
+ <string name="my_power_station_malfunction">Fault</string>
<string name="my_power_station_operation">Running</string>
<string name="my_power_station_await">Standby</string>
<string name="my_power_station_data_null">Data is empty, create one now!</string>
@@ -96,7 +96,7 @@
<string name="message_recover">Restored</string>
<string name="message_alarm_info">Alarm details</string>
<string name="message_alarm">Alarm</string>
- <string name="message_alarm_malfunction">Faulty</string>
+ <string name="message_alarm_malfunction">Fault</string>
<string name="messagealarm_details_content">Alarm content</string>
<string name="messagealarm_details_device">Alarm device</string>
<string name="message_alarm_detailsaffect_region">Impact area</string>
@@ -119,7 +119,7 @@
<string name="set_push_notification">Push Notifications</string>
<string name="set_alarm_message">Alert Messages</string>
<string name="set_general_setting">General Settings</string>
- <string name="set_multilingual">Multi-language</string>
+ <string name="set_multilingual">Language</string>
<string name="set_data_centre">Data Center</string>
<string name="set_system_rights_managemen">Permissions Management</string>
<string name="set_3_msg_sharing">Data Shared with Third-Parties</string>
@@ -179,7 +179,7 @@
<string name="loading_agree">Agree</string>
<string name="loading_on_agree">Disagree</string>
<string name="loading_privacy">Privacy policy and terms of service</string>
- <string name="loading_privacy_server">To better protect your legitimate rights and interests, please read and agree to the following agreements: 銆奝rivacy Policy銆� and 銆奣erms of Service銆�.</string>
+ <string name="loading_privacy_server">To better protect your legitimate rights and interests, please read and agree to the following agreements 銆奝rivacy Policy銆� and 銆奣erms of Service銆�.</string>
<string name="kill_app">Press again to exit </string>
<string name="loading_not_supported">Sorry, not supported yet</string>
<string name="loading_title_tip">Prompt</string>
--
Gitblit v1.8.0