openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'y2209bug' into 'dbus-interface' 

IPv拼写修正

See merge request kylin-desktop/kylin-nm!713
This commit is contained in:
陈学超 2022-09-22 08:27:50 +00:00
parent 28fa451a39 a6940cc826
commit 8e32a63dd5
9 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/netdetails/creatnetpage.cpp
View File

@ -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"));

12
src/frontend/netdetails/detailpage.cpp
View File

@ -243,17 +243,17 @@ void DetailPage::initUI() {
m_IPV4 = new QLabel(this);
m_ipv4Widget = new DetailWidget(qobject_cast<QWidget *>(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<QWidget *>(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<QWidget *>(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<QWidget *>(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;

2
src/frontend/netdetails/ipv4page.cpp
View File

@ -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"));

2
src/frontend/netdetails/ipv6page.cpp
View File

@ -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"));

4
src/frontend/netdetails/netdetail.cpp
View File

@ -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) {

BIN
translations/kylin-nm_bo_CN.qm
View File

Binary file not shown.

48
translations/kylin-nm_bo_CN.ts
View File

@ -24,11 +24,11 @@
<translation type="vanished">正在检测ip地址冲突</translation>
</message>
<message>
<source>IPV4 address conflict, Please change IP</source>
<source>IPv4 address conflict, Please change IP</source>
<translation type="vanished">ip地址冲突，请更改ip</translation>
</message>
<message>
<source>IPV6 address conflict, Please change IP</source>
<source>IPv6 address conflict, Please change IP</source>
<translation type="obsolete">ip地址冲突，请更改ip {6 ?}</translation>
</message>
</context>
@ -87,8 +87,8 @@
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="51"/>
<source>Ipv4Config</source>
<translation>Ipv4ཁུང་ཙི།</translation>
<source>IPv4Config</source>
<translation>IPv4ཁུང་ཙི།</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="52"/>
@ -187,20 +187,20 @@
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="256"/>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="327"/>
<source>IPV6:</source>
<translation>IPV6:</translation>
<source>IPv6:</source>
<translation>IPv6:</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="246"/>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="325"/>
<source>IPV4:</source>
<translation>IPV4:</translation>
<source>IPv4:</source>
<translation>IPv4:</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="250"/>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="326"/>
<source>IPV4 Dns:</source>
<translation>IPV4 Dns:</translation>
<source>IPv4 Dns:</source>
<translation>IPv4 Dns:</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="260"/>
@ -518,8 +518,8 @@
<name>Ipv4Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<source>Ipv4Config</source>
<translation>Ipv4ཁུང་ཙི།</translation>
<source>IPv4Config</source>
<translation>IPv4ཁུང་ཙི།</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
@ -582,8 +582,8 @@
<name>Ipv6Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<source>Ipv6Config</source>
<translation>Ipv6ཁུང་ཙི།</translation>
<source>IPv6Config</source>
<translation>IPv6ཁུང་ཙི།</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
@ -814,13 +814,13 @@
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="338"/>
<source>Ipv4</source>
<translation>Ipv4</translation>
<source>IPv4</source>
<translation>IPv4</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="339"/>
<source>Ipv6</source>
<translation>Ipv6</translation>
<source>IPv6</source>
<translation>IPv6</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="341"/>
@ -935,16 +935,16 @@
<translation type="obsolete">带宽：</translation>
</message>
<message>
<source>IPV4:</source>
<translation type="obsolete">IPV4地址：</translation>
<source>IPv4:</source>
<translation type="obsolete">IPv4地址：</translation>
</message>
<message>
<source>IPV4 Dns:</source>
<translation type="obsolete">IPV4 DNS服务器：</translation>
<source>IPv4 Dns:</source>
<translation type="obsolete">IPv4 DNS服务器：</translation>
</message>
<message>
<source>IPV6:</source>
<translation type="obsolete">本地链接IPV6地址：</translation>
<source>IPv6:</source>
<translation type="obsolete">本地链接IPv6地址：</translation>
</message>
<message>
<source>Mac:</source>

BIN
translations/kylin-nm_zh_CN.qm
View File

Binary file not shown.

50
translations/kylin-nm_zh_CN.ts
View File

@ -24,11 +24,11 @@
<translation type="vanished">正在检测ip地址冲突</translation>
</message>
<message>
<source>IPV4 address conflict, Please change IP</source>
<source>IPv4 address conflict, Please change IP</source>
<translation type="vanished">ip地址冲突，请更改ip</translation>
</message>
<message>
<source>IPV6 address conflict, Please change IP</source>
<source>IPv6 address conflict, Please change IP</source>
<translation type="obsolete">ip地址冲突，请更改ip {6 ?}</translation>
</message>
</context>
@ -87,13 +87,13 @@
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="51"/>
<source>Ipv4Config</source>
<translation>IPV4配置</translation>
<source>IPv4Config</source>
<translation>IPv4配置</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="52"/>
<source>Address</source>
<translation>IPV4地址</translation>
<translation>IPv4地址</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="53"/>
@ -187,20 +187,20 @@
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="256"/>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="327"/>
<source>IPV6:</source>
<translation>本地链接IPV6地址：</translation>
<source>IPv6:</source>
<translation>本地链接IPv6地址：</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="246"/>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="325"/>
<source>IPV4:</source>
<translation>IPV4地址：</translation>
<source>IPv4:</source>
<translation>IPv4地址：</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="250"/>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="326"/>
<source>IPV4 Dns:</source>
<translation>IPV4 DNS服务器：</translation>
<source>IPv4 Dns:</source>
<translation>IPv4 DNS服务器：</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/detailpage.cpp" line="260"/>
@ -518,8 +518,8 @@
<name>Ipv4Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<source>Ipv4Config</source>
<translation>Ipv4配置</translation>
<source>IPv4Config</source>
<translation>IPv4配置</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
@ -582,8 +582,8 @@
<name>Ipv6Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<source>Ipv6Config</source>
<translation>Ipv6配置</translation>
<source>IPv6Config</source>
<translation>IPv6配置</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
@ -814,13 +814,13 @@
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="338"/>
<source>Ipv4</source>
<translation>Ipv4</translation>
<source>IPv4</source>
<translation>IPv4</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="339"/>
<source>Ipv6</source>
<translation>Ipv6</translation>
<source>IPv6</source>
<translation>IPv6</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="341"/>
@ -935,16 +935,16 @@
<translation type="obsolete">带宽：</translation>
</message>
<message>
<source>IPV4:</source>
<translation type="obsolete">IPV4地址：</translation>
<source>IPv4:</source>
<translation type="obsolete">IPv4地址：</translation>
</message>
<message>
<source>IPV4 Dns:</source>
<translation type="obsolete">IPV4 DNS服务器：</translation>
<source>IPv4 Dns:</source>
<translation type="obsolete">IPv4 DNS服务器：</translation>
</message>
<message>
<source>IPV6:</source>
<translation type="obsolete">本地链接IPV6地址：</translation>
<source>IPv6:</source>
<translation type="obsolete">本地链接IPv6地址：</translation>
</message>
<message>
<source>Mac:</source>