From 6666e651e35ef6ae079247da975c58098111c13c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:50:25 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/res/values/strings.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a9443b1..7424c44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -287,16 +287,16 @@
<string name="grid_connected">骞剁綉</string>
<string name="off_network">绂荤綉</string>
<string name="the_input_value_has_been_exceeded">杈撳叆鍊煎凡缁忚秴杩�</string>
- <string name="all_read">涓�閿竻闄�</string>
+ <string name="all_read">鍏ㄩ儴宸茶</string>
<string name="contact_us">鑱旂郴鎴戜滑</string>
<string name="wechat_id">寰俊鍙�</string>
<string name="email_address">閭鍦板潃</string>
- <string name="successful_replication">澶嶅埗鎴愬姛</string>
+ <string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
<string name="to_be_added">寰呮帴鍏�</string>
<string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
<string name="co_reduction_rate">CO2鍑忔帓</string>
- <string name="quantity_of_equivalent_values">绛夋晥鍊兼暟閲�</string>
- <string name="pv_power">Pv鍙戠數鍔熺巼</string>
+ <string name="quantity_of_equivalent_values">绛夋晥妞嶆爲閲�</string>
+ <string name="pv_power">鍙戠數鍔熺巼</string>
<string name="device_run_state">璁惧杩愯鐘舵��</string>
<string name="search_station">鎼滅储鐢电珯</string>
<string name="enter_the_device_sn_and_device_name">杈撳叆璁惧SN鍙�/璁惧鍚嶇О</string>
@@ -304,5 +304,7 @@
<string name="device">璁惧</string>
<string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
<string name="active_power">鏈夊姛鍔熺巼</string>
+ <string name="t">鍚�</string>
+ <string name="number">妫�</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0