From 77955a5550300076439b1c2df669e557da4329f6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 04 十一月 2024 11:26:51 +0800
Subject: [PATCH] 2024年11月04日11:26:49
---
app/src/main/res/values-zh/strings.xml | 2 +-
app/src/main/res/layout/fragment_home_page.xml | 6 +++---
app/src/main/res/values/strings.xml | 2 +-
app/src/main/res/values-en/strings.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 4a3ad77..34a8fef 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -536,7 +536,7 @@
<TextView
android:id="@+id/social_contribution_des_1_tv"
android:layout_width="wrap_content"
- android:layout_height="15dp"
+ android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
@@ -592,7 +592,7 @@
<TextView
android:id="@+id/social_contribution_des_2_tv"
android:layout_width="wrap_content"
- android:layout_height="15dp"
+ android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
@@ -645,7 +645,7 @@
<TextView
android:id="@+id/social_contribution_des_3_tv"
android:layout_width="wrap_content"
- android:layout_height="15dp"
+ android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 98a35af..188767a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -294,7 +294,7 @@
<string name="email_address">Email</string>
<string name="successful_replication">Copied to clipboard</string>
<string name="to_be_added">Installing</string>
- <string name="saving_standard_coal">Stanard Coal Saved</string>
+ <string name="saving_standard_coal">Standard Coal Saved</string>
<string name="co_reduction_rate">CO2 Emission Saved</string>
<string name="quantity_of_equivalent_values">Equivalent Trees Planted</string>
<string name="pv_power">Generation capacity</string>
@@ -305,7 +305,7 @@
<string name="device">Device</string>
<string name="Offline_fault">Offline with fault</string>
<string name="active_power">Active power</string>
- <string name="t">Ton</string>
+ <string name="t">T</string>
<string name="number"></string>
<string name="device_off">Device Offline!</string>
<string name="summarize">Summary</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c70742f..f58f388 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -292,7 +292,7 @@
<string name="email_address">閭鍦板潃</string>
<string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
<string name="to_be_added">寰呮帴鍏�</string>
- <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</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">鍙戠數鍔熺巼</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 999b3b4..f8e78ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -293,7 +293,7 @@
<string name="email_address">閭鍦板潃</string>
<string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
<string name="to_be_added">寰呮帴鍏�</string>
- <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</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">鍙戠數鍔熺巼</string>
--
Gitblit v1.8.0