From f581aef16a23b6647c06e600331764b7f46042e6 Mon Sep 17 00:00:00 2001
From: zhangyuanyuan1 <zhangyuanyuan1@kylinos.cn>
Date: Thu, 6 Jul 2023 11:48:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3ip=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/netdetails/creatnetpage.cpp | 2 ++
 src/frontend/netdetails/ipv4page.cpp     | 2 ++
 src/frontend/netdetails/ipv6page.cpp     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/frontend/netdetails/creatnetpage.cpp b/src/frontend/netdetails/creatnetpage.cpp
index faf3dc34..bd50cc20 100644
--- a/src/frontend/netdetails/creatnetpage.cpp
+++ b/src/frontend/netdetails/creatnetpage.cpp
@@ -101,6 +101,8 @@ void CreatNetPage::initUI()
     m_detailLayout->addRow(m_maskLabel, maskWidget);
     m_detailLayout->addRow(m_gateWayLabel,gateWayEdit);
     m_detailLayout->addRow(gateWayEmptyLabel);
+    m_addressLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);  //解决布局错位问题
+    m_maskLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);
 
     m_detailLayout->addRow(m_dnsWidget);
 
diff --git a/src/frontend/netdetails/ipv4page.cpp b/src/frontend/netdetails/ipv4page.cpp
index 37349ef4..185219d4 100644
--- a/src/frontend/netdetails/ipv4page.cpp
+++ b/src/frontend/netdetails/ipv4page.cpp
@@ -111,6 +111,8 @@ void Ipv4Page::initUI() {
     m_detailLayout->addRow(divider);
     m_detailLayout->addRow(m_dnsEmptyLabel);
     m_detailLayout->addRow(m_dnsWidget);
+    m_addressLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);  //解决布局错位问题
+    m_maskLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);
 
     ipv4ConfigCombox->addItem(tr("Auto(DHCP)")); //"自动(DHCP)"
     ipv4ConfigCombox->addItem(tr("Manual")); //"手动"
diff --git a/src/frontend/netdetails/ipv6page.cpp b/src/frontend/netdetails/ipv6page.cpp
index b65a3a0a..d5968ff1 100644
--- a/src/frontend/netdetails/ipv6page.cpp
+++ b/src/frontend/netdetails/ipv6page.cpp
@@ -174,6 +174,8 @@ void Ipv6Page::initUI() {
     m_detailLayout->addRow(m_subnetEmptyLabel);
     m_detailLayout->addRow(m_gateWayLabel,gateWayWidget);
     m_detailLayout->addRow(m_dnsWidget);
+    m_addressLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);  //解决布局错位问题
+    m_gateWayLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);
 
     ipv6ConfigCombox->addItem(tr("Auto(DHCP)")); //"自动(DHCP)"
     ipv6ConfigCombox->addItem(tr("Manual")); //"手动"

From a7ed8f4b6dc45b6e11213538951d7b155d985152 Mon Sep 17 00:00:00 2001
From: zhangyuanyuan1 <zhangyuanyuan1@kylinos.cn>
Date: Fri, 7 Jul 2023 10:02:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E8=A7=84=E8=8C=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8A=A5=E9=94=99=E6=96=87=E6=A1=88=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/translations/kylin-nm_zh_CN.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/translations/kylin-nm_zh_CN.ts b/src/translations/kylin-nm_zh_CN.ts
index e0d79c9e..8a873282 100644
--- a/src/translations/kylin-nm_zh_CN.ts
+++ b/src/translations/kylin-nm_zh_CN.ts
@@ -118,12 +118,12 @@
     <message>
         <location filename="../frontend/netdetails/creatnetpage.cpp" line="172"/>
         <source>Invalid address</source>
-        <translation>无效地址</translation>
+        <translation>无效的IP地址</translation>
     </message>
     <message>
         <location filename="../frontend/netdetails/creatnetpage.cpp" line="181"/>
         <source>Invalid subnet mask</source>
-        <translation>无效子网掩码</translation>
+        <translation>无效的子网掩码</translation>
     </message>
     <message>
         <location filename="../frontend/netdetails/creatnetpage.cpp" line="201"/>
@@ -621,12 +621,12 @@
     <message>
         <location filename="../frontend/netdetails/ipv4page.cpp" line="272"/>
         <source>Invalid address</source>
-        <translation>无效地址</translation>
+        <translation>无效的IP地址</translation>
     </message>
     <message>
         <location filename="../frontend/netdetails/ipv4page.cpp" line="281"/>
         <source>Invalid subnet mask</source>
-        <translation>无效子网掩码</translation>
+        <translation>无效的子网掩码</translation>
     </message>
     <message>
         <location filename="../frontend/netdetails/ipv4page.cpp" line="307"/>
@@ -689,12 +689,12 @@
     <message>
         <location filename="../frontend/netdetails/ipv6page.cpp" line="250"/>
         <source>Invalid address</source>
-        <translation>无效地址</translation>
+        <translation>无效的IP地址</translation>
     </message>
     <message>
         <location filename="../frontend/netdetails/ipv6page.cpp" line="259"/>
         <source>Invalid gateway</source>
-        <translation>无效网关</translation>
+        <translation>无效的网关地址</translation>
     </message>
     <message>
         <location filename="../frontend/netdetails/ipv6page.cpp" line="303"/>