Merge branch 'yhkylin/v101' of https://gitlab2.kylin.com/kylinos-src/kylin-nm into v101-local
This commit is contained in:
commit
d9cf3d4252
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue