From c870de9e4207c7af37229cb24b9ca0e2d1e1215f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 15:09:00 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/res/values/strings.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 329bd70..a834b3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
<string name="home_login_logoin">鐧诲綍</string>
<string name="home_login_be_logging_in">鐧诲綍涓��</string>
<string name="home_login_power_station">浣撻獙鐢电珯</string>
- <string name="home_login_consent_service_agreement">鍚屾剰銆婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��</string>
+ <string name="home_login_consent_service_agreement">鍚屾剰銆婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��</string>
<string name="home_login_error_account_null">璐﹀彿涓嶈兘涓虹┖.</string>
<string name="home_login_error_password_null">瀵嗙爜涓嶈兘涓虹┖.</string>
<string name="home_login_error_account_or_password">璐﹀彿鎴栬�呭瘑鐮佷笉瀵�,璇烽噸鏂拌緭鍏�.</string>
@@ -178,7 +178,7 @@
<string name="loading_agree">鍚屾剰骞剁櫥褰�</string>
<string name="loading_on_agree">涓嶅悓鎰�</string>
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
- <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��</string>
+ <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�娿�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁�嬨��</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
<string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔</string>
<string name="loading_title_tip">鎻愮ず</string>
@@ -281,7 +281,7 @@
<string name="no_equipment">鏆傛棤璁惧!</string>
<string name="filtering">绛涢��</string>
<string name="reset">閲嶇疆</string>
- <string name="string_capacity">缁勪覆瀹归噺:</string>
+ <string name="string_capacity">缁勪覆瀹归噺</string>
<string name="grid_connected_state">骞剁綉鐘舵��</string>
<string name="grid_connected">骞剁綉</string>
<string name="off_network">绂荤綉</string>
--
Gitblit v1.8.0