Merge branch '2309-0713' into 'yhkylin/v101'

fix bug 173580 【界面用语-走查】【其他网络】优化加入其他网络文案描述

See merge request kylinos-src/kylin-nm!216
This commit is contained in:
陈学超 2023-07-14 02:06:32 +00:00
commit e1046e5bec
6 changed files with 17 additions and 17 deletions

View File

@ -133,8 +133,8 @@ void JoinHiddenWiFiPage::initUI()
m_bottomLayout->addWidget(m_cancelBtn);
m_bottomLayout->addWidget(m_joinBtn);
//请输入您想要加入网络的名称和安全类型
m_descriptionLabel->setLabelText(tr("Please enter the network name and security type"));
//请输入您想要加入的网络信息
m_descriptionLabel->setLabelText(tr("Please enter the network information"));
QFont font = m_descriptionLabel->font();
font.setWeight(MEDIUM_WEIGHT_VALUE);
m_descriptionLabel->setFont(font);
@ -147,7 +147,7 @@ void JoinHiddenWiFiPage::initUI()
m_nameEdit->setMaxLength(MAX_NAME_LENGTH);
m_nameEdit->setPlaceholderText(tr("Required")); //必填
this->setWindowTitle(tr("Find and Join Wi-Fi"));
this->setWindowTitle(tr("Find and Join WLAN"));
this->setWindowIcon(QIcon::fromTheme("kylin-network"));
this->setFixedWidth(WINDOW_WIDTH);
this->setFixedHeight(MIN_WINDOW_HEIGHT);

View File

@ -382,7 +382,7 @@
<name>JoinHiddenWiFiPage</name>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="137"/>
<source>Please enter the network name and security type</source>
<source>Please enter the network information</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -412,7 +412,7 @@
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join Wi-Fi</source>
<source>Find and Join WLAN</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -706,8 +706,8 @@
<name>JoinHiddenWiFiPage</name>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="137"/>
<source>Please enter the network name and security type</source>
<translation></translation>
<source>Please enter the network information</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="142"/>
@ -740,8 +740,8 @@
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join Wi-Fi</source>
<translation>WI-FI</translation>
<source>Find and Join WLAN</source>
<translation>WLAN</translation>
</message>
</context>
<context>

View File

@ -690,7 +690,7 @@
<name>JoinHiddenWiFiPage</name>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="137"/>
<source>Please enter the network name and security type</source>
<source>Please enter the network information</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -720,7 +720,7 @@
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join Wi-Fi</source>
<source>Find and Join WLAN</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -1401,7 +1401,7 @@
<name>JoinHiddenWiFiPage</name>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="137"/>
<source>Please enter the network name and security type</source>
<source>Please enter the network information</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1431,7 +1431,7 @@
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join Wi-Fi</source>
<source>Find and Join WLAN</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -706,8 +706,8 @@
<name>JoinHiddenWiFiPage</name>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="137"/>
<source>Please enter the network name and security type</source>
<translation></translation>
<source>Please enter the network information</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="142"/>
@ -740,8 +740,8 @@
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join Wi-Fi</source>
<translation> Wi-Fi</translation>
<source>Find and Join WLAN</source>
<translation>线</translation>
</message>
</context>
<context>