From a6940cc826ab4bce8a7e0d2bf7ba42ce78b2e2d6 Mon Sep 17 00:00:00 2001 From: zhangyuanyuan1 Date: Thu, 22 Sep 2022 16:24:11 +0800 Subject: [PATCH] =?UTF-8?q?IPv=E6=8B=BC=E5=86=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/netdetails/creatnetpage.cpp | 2 +- src/frontend/netdetails/detailpage.cpp | 12 +++--- src/frontend/netdetails/ipv4page.cpp | 2 +- src/frontend/netdetails/ipv6page.cpp | 2 +- src/frontend/netdetails/netdetail.cpp | 4 +- translations/kylin-nm_bo_CN.qm | Bin 16851 -> 16851 bytes translations/kylin-nm_bo_CN.ts | 48 +++++++++++----------- translations/kylin-nm_zh_CN.qm | Bin 10503 -> 10503 bytes translations/kylin-nm_zh_CN.ts | 50 +++++++++++------------ 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/frontend/netdetails/creatnetpage.cpp b/src/frontend/netdetails/creatnetpage.cpp index 95a0fc3c..bc02b552 100644 --- a/src/frontend/netdetails/creatnetpage.cpp +++ b/src/frontend/netdetails/creatnetpage.cpp @@ -48,7 +48,7 @@ void CreatNetPage::initUI() m_secDnsLabel = new QLabel(this); m_connNameLabel->setText(tr("Connection Name")); - m_configLabel->setText(tr("Ipv4Config")); + m_configLabel->setText(tr("IPv4Config")); m_addressLabel->setText(tr("Address")); m_maskLabel->setText(tr("Netmask")); m_gateWayLabel->setText(tr("Default Gateway")); diff --git a/src/frontend/netdetails/detailpage.cpp b/src/frontend/netdetails/detailpage.cpp index fb9e6e76..10001b0a 100644 --- a/src/frontend/netdetails/detailpage.cpp +++ b/src/frontend/netdetails/detailpage.cpp @@ -243,17 +243,17 @@ void DetailPage::initUI() { m_IPV4 = new QLabel(this); m_ipv4Widget = new DetailWidget(qobject_cast(m_IPV4), m_listWidget); - m_ipv4Widget->setKey(tr("IPV4:")); + m_ipv4Widget->setKey(tr("IPv4:")); m_IPV4Dns = new QLabel(this); m_ipv4DnsWidget = new DetailWidget(qobject_cast(m_IPV4Dns), m_listWidget); - m_ipv4DnsWidget->setKey(tr("IPV4 Dns:")); + m_ipv4DnsWidget->setKey(tr("IPv4 Dns:")); m_IPV6 = new FixLabel(this); m_IPV6->setFixedWidth(MAX_LABEL_WIDTH); m_IPV6->setAlignment(Qt::AlignRight | Qt::AlignVCenter); m_ipv6Widget = new DetailWidget(qobject_cast(m_IPV6), m_listWidget); - m_ipv6Widget->setKey(tr("IPV6:")); + m_ipv6Widget->setKey(tr("IPv6:")); m_Mac = new QLabel(this); m_macWidget = new DetailWidget(qobject_cast(m_Mac), m_listWidget); @@ -322,9 +322,9 @@ void DetailPage::on_btnCopyNetDetail_clicked() QString hzCopy= tr ("Hz:"); QString chanCopy= tr ("Chan:"); QString bandwithCopy = tr("BandWidth:"); - QString ipv4Copy = tr("IPV4:"); - QString ipv4dnsCopy = tr("IPV4 Dns:"); - QString ipv6Copy = tr("IPV6:"); + QString ipv4Copy = tr("IPv4:"); + QString ipv4dnsCopy = tr("IPv4 Dns:"); + QString ipv6Copy = tr("IPv6:"); QString macCopy = tr("Mac:"); QString netDetailCopyText; diff --git a/src/frontend/netdetails/ipv4page.cpp b/src/frontend/netdetails/ipv4page.cpp index df031a82..17669b47 100644 --- a/src/frontend/netdetails/ipv4page.cpp +++ b/src/frontend/netdetails/ipv4page.cpp @@ -68,7 +68,7 @@ void Ipv4Page::initUI() { m_firstDnsEmptyLabel->setFixedHeight(LABEL_HEIGHT); - m_configLabel->setText(tr("Ipv4Config")); + m_configLabel->setText(tr("IPv4Config")); m_addressLabel->setText(tr("Address")); m_maskLabel->setText(tr("Netmask")); m_gateWayLabel->setText(tr("Default Gateway")); diff --git a/src/frontend/netdetails/ipv6page.cpp b/src/frontend/netdetails/ipv6page.cpp index 37c0aaea..c626a567 100644 --- a/src/frontend/netdetails/ipv6page.cpp +++ b/src/frontend/netdetails/ipv6page.cpp @@ -149,7 +149,7 @@ void Ipv6Page::initUI() { m_firstDnsEmptyLabel->setFixedHeight(LABEL_HEIGHT); - m_configLabel->setText(tr("Ipv6Config")); + m_configLabel->setText(tr("IPv6Config")); m_addressLabel->setText(tr("Address")); m_subnetLabel->setText(tr("Subnet prefix Length")); m_gateWayLabel->setText(tr("Default Gateway")); diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index d3ad8c2e..7c2c6c3e 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -335,8 +335,8 @@ void NetDetail::initUI() m_netTabBar = new NetTabBar(this); m_netTabBar->setTabBarStyle(KTabBarStyle::SegmentDark); m_netTabBar->addTab(tr("Detail")); //详情 - m_netTabBar->addTab(tr("Ipv4"));//Ipv4 - m_netTabBar->addTab(tr("Ipv6"));//Ipv6 + m_netTabBar->addTab(tr("IPv4"));//Ipv4 + m_netTabBar->addTab(tr("IPv6"));//Ipv6 if (isWlan) { m_netTabBar->addTab(tr("Security"));//安全 if (isActive) { diff --git a/translations/kylin-nm_bo_CN.qm b/translations/kylin-nm_bo_CN.qm index fb2d4979066ae34057acb20e13710f0c9910f50b..ecf1d18306d8bf097570b0cf623dd88c32471e3d 100644 GIT binary patch delta 317 zcmccI%y_w(aY7gu%kwD=42nq%EYBwAF)(l?G5A$Zd=SI9ce5?yL`MEatJ4`6 z*zGyMw7}HKcbT*qr6zMS7cmLyO|E6OWCu%#s7&6=EY5j}TT^Q?1A|E7=DW;29E<^z z=ZVQO25j!&Im0AX#$dvrz~I7=$56~*#lZjsY(UKE8BjJkk6%FuB#jVe1qm#VF|44w>7J0|ZDlbXC+^xo!cVkJzRUqhezy$6P7NCtLlNnWo#W_Hxf;6MZnE~ZQH{VnHDg^*{ C08MrP delta 317 zcmccI%y_w(aY7guEBh1%2E`->R`!Vr<(!dK3=CXJ41SRlAH*;=Y_?^b$jHCYJDq`n z-JSzX3l>kl%cRX{HJOvSh)Lk%XIJI2eF{4Tw2C1HvZf@hb>{q!GfbAmIi4GQwdD zW@y4@lNa)fZhpdloptgL(R-|744w>7dnVr#mD+qwtb_?D5j6RqIM?LIl6g=C{*pk4 zOwN^*ntV-6eRGAB2#;_9Lm7h!+#xKU1!X3a8C8YFIY1@?<;+mz%z$#DoA0T8l>z{^ Ccukc6 diff --git a/translations/kylin-nm_bo_CN.ts b/translations/kylin-nm_bo_CN.ts index e11cd60f..a0b8c59d 100644 --- a/translations/kylin-nm_bo_CN.ts +++ b/translations/kylin-nm_bo_CN.ts @@ -24,11 +24,11 @@ 正在检测ip地址冲突 - IPV4 address conflict, Please change IP + IPv4 address conflict, Please change IP ip地址冲突，请更改ip - IPV6 address conflict, Please change IP + IPv6 address conflict, Please change IP ip地址冲突，请更改ip {6 ?} @@ -87,8 +87,8 @@ - Ipv4Config - Ipv4ཁུང་ཙི། + IPv4Config + IPv4ཁུང་ཙི། @@ -187,20 +187,20 @@ - IPV6: - IPV6: + IPv6: + IPv6: - IPV4: - IPV4: + IPv4: + IPv4: - IPV4 Dns: - IPV4 Dns: + IPv4 Dns: + IPv4 Dns: @@ -518,8 +518,8 @@ Ipv4Page - Ipv4Config - Ipv4ཁུང་ཙི། + IPv4Config + IPv4ཁུང་ཙི། @@ -582,8 +582,8 @@ Ipv6Page - Ipv6Config - Ipv6ཁུང་ཙི། + IPv6Config + IPv6ཁུང་ཙི། @@ -814,13 +814,13 @@ - Ipv4 - Ipv4 + IPv4 + IPv4 - Ipv6 - Ipv6 + IPv6 + IPv6 @@ -935,16 +935,16 @@ 带宽： - IPV4: - IPV4地址： + IPv4: + IPv4地址： - IPV4 Dns: - IPV4 DNS服务器： + IPv4 Dns: + IPv4 DNS服务器： - IPV6: - 本地链接IPV6地址： + IPv6: + 本地链接IPv6地址： Mac: diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm index e7d265ba3e5476989d959de95c090813bf2ce6b7..35bd96cd5c055c2f073cc5c604637b2596bd93d6 100644 GIT binary patch delta 392 zcmZn zKL?oRYMs25Nt;n>@wcn#{n!^Kvdy>I zB^ag47)&Pm*5`3B00A2ib9n}onKr=niO2}iYFU#iB6W|W)lah4mSvQKvKgBQUjI`;N}C$n_-bR1ImkS z?&iM1EXl**$q>MR#dVY4@JmfzBB(XFpO0(ubbg!7Yy$HbS;5LD3knHy29%jWoj*yi oYO}piHoGv`9Jpgyzz&%xAw2nlBnw#13`NdtGEi>wFG*g00IMNh@c;k- delta 398 zcmZnAYcPxF3*B86X*QAw9NF$^Et#Ovk6FUw&h&Ts0vibpuph5;KvZ0 z&KtBaEaSfvTob2fK$wYwOJ4D0LoU(Da@=g正在检测ip地址冲突 - IPV4 address conflict, Please change IP + IPv4 address conflict, Please change IP ip地址冲突，请更改ip - IPV6 address conflict, Please change IP + IPv6 address conflict, Please change IP ip地址冲突，请更改ip {6 ?} @@ -87,13 +87,13 @@ - Ipv4Config - IPV4配置 + IPv4Config + IPv4配置 Address - IPV4地址 + IPv4地址 @@ -187,20 +187,20 @@ - IPV6: - 本地链接IPV6地址： + IPv6: + 本地链接IPv6地址： - IPV4: - IPV4地址： + IPv4: + IPv4地址： - IPV4 Dns: - IPV4 DNS服务器： + IPv4 Dns: + IPv4 DNS服务器： @@ -518,8 +518,8 @@ Ipv4Page - Ipv4Config - Ipv4配置 + IPv4Config + IPv4配置 @@ -582,8 +582,8 @@ Ipv6Page - Ipv6Config - Ipv6配置 + IPv6Config + IPv6配置 @@ -814,13 +814,13 @@ - Ipv4 - Ipv4 + IPv4 + IPv4 - Ipv6 - Ipv6 + IPv6 + IPv6 @@ -935,16 +935,16 @@ 带宽： - IPV4: - IPV4地址： + IPv4: + IPv4地址： - IPV4 Dns: - IPV4 DNS服务器： + IPv4 Dns: + IPv4 DNS服务器： - IPV6: - 本地链接IPV6地址： + IPv6: + 本地链接IPv6地址： Mac: