Merge branch '2209bug-tray' into 'yhkylin/v101'

修改详情页英文文本并更新对应翻译

See merge request kylinos-src/kylin-nm!75
This commit is contained in:
赵世旭 2023-01-06 08:41:20 +00:00
commit 7ca29d0ce4
7 changed files with 13 additions and 39 deletions

View File

@ -65,7 +65,7 @@ void ConfigPage::initUi()
"it is suitable for networks in public places, such as airports or coffee shops, etc."));
m_publicLabel->setWordWrap(true);
//专用 网络中的设备可发现此电脑。一般情况下适用于家庭或工作单位的网络,您认识并信任网络上的个人和设备。
m_privateLabel->setText(tr("Devices on the network can discover this computer. Generally applicable to a network "
m_privateLabel->setText(tr("Private Devices on the network can discover this computer. Generally applicable to a network "
"at home or work where you know and trust the individuals and devices on the network."));
m_privateLabel->setWordWrap(true);
//配置防火墙和安全设置

View File

@ -393,12 +393,12 @@ void NetDetail::loadPage()
if (m_isCreateNet && !isWlan) {
pageFrame->hide();
stackWidget->setCurrentIndex(CREATE_NET_PAGE_NUM);
this->setWindowTitle(tr("Add Lan Connect"));
this->setWindowTitle(tr("Add LAN Connect"));
} else {
stackWidget->setCurrentIndex(DETAIL_PAGE_NUM);
this->setWindowTitle(m_name);
if (isWlan && m_name.isEmpty()) {
this->setWindowTitle(tr("connect hiddin wlan"));
this->setWindowTitle(tr("Connect Hidden WLAN"));
}
}
}

View File

@ -223,7 +223,7 @@ void SecurityPage::initUI()
//PEAP TTLS共有
eapMethodLabel->setLabelText(tr("Ineer authentication"));
userNameLabel->setText(tr("Usename"));
userNameLabel->setText(tr("Username"));
userPwdLabel->setText(tr("Password"));
userPwdFlagLabel->setText(tr("Ask pwd each query"));
userNameEdit->setPlaceholderText(tr("Required"));

Binary file not shown.

View File

@ -46,17 +46,9 @@
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="68"/>
<source>Devices on the network can discover this computer. Generally applicable to a network at home or work where you know and trust the individuals and devices on the network.</source>
<source>Private Devices on the network can discover this computer. Generally applicable to a network at home or work where you know and trust the individuals and devices on the network.</source>
<translation> .</translation>
</message>
<message>
<source>Public(recommended) Your device can not be discovered on the network. In most cases, use this feature when connected to a network at home, work, or a public location.</source>
<translation type="vanished">() .</translation>
</message>
<message>
<source>Private Your device can be discovered on the network. Select this if you require file sharing or use applications that communicate over this network. You should know and trust the people and devices on the network.</source>
<translation type="vanished"> .</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="72"/>
<source>Config firewall and security settings</source>
@ -882,12 +874,12 @@
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="403"/>
<source>Add Lan Connect</source>
<source>Add LAN Connect</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="408"/>
<source>connect hiddin wlan</source>
<source>Connect Hidden WLAN</source>
<translation></translation>
</message>
<message>
@ -1123,13 +1115,8 @@
</message>
<message>
<location filename="../src/frontend/netdetails/securitypage.cpp" line="223"/>
<source>Usename</source>
<translation></translation>
</message>
<message>
<source>Username</source>
<oldsource>Usename</oldsource>
<translation type="vanished"></translation>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/securitypage.cpp" line="225"/>

Binary file not shown.

View File

@ -42,21 +42,13 @@
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="64"/>
<source>Public(recommended) Devices on the network cannot discover this computer. Generally, it is suitable for networks in public places, such as airports or coffee shops, etc.</source>
<translation> </translation>
<translation> </translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="68"/>
<source>Devices on the network can discover this computer. Generally applicable to a network at home or work where you know and trust the individuals and devices on the network.</source>
<source>Private Devices on the network can discover this computer. Generally applicable to a network at home or work where you know and trust the individuals and devices on the network.</source>
<translation> </translation>
</message>
<message>
<source>Public(recommended) Your device can not be discovered on the network. In most cases, use this feature when connected to a network at home, work, or a public location.</source>
<translation type="vanished">使</translation>
</message>
<message>
<source>Private Your device can be discovered on the network. Select this if you require file sharing or use applications that communicate over this network. You should know and trust the people and devices on the network.</source>
<translation type="vanished"> 使</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="72"/>
<source>Config firewall and security settings</source>
@ -882,12 +874,12 @@
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="403"/>
<source>Add Lan Connect</source>
<source>Add LAN Connect</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="408"/>
<source>connect hiddin wlan</source>
<source>Connect Hidden WLAN</source>
<translation>WLAN</translation>
</message>
<message>
@ -1123,13 +1115,8 @@
</message>
<message>
<location filename="../src/frontend/netdetails/securitypage.cpp" line="223"/>
<source>Usename</source>
<translation></translation>
</message>
<message>
<source>Username</source>
<oldsource>Usename</oldsource>
<translation type="vanished"></translation>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/securitypage.cpp" line="225"/>