Merge branch '2209bug-tray' into 'yhkylin/v101'
修改详情页英文文本并更新对应翻译 See merge request kylinos-src/kylin-nm!75
This commit is contained in:
commit
7ca29d0ce4
|
@ -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);
|
||||
//配置防火墙和安全设置
|
||||
|
|
|
@ -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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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.
|
@ -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.
|
@ -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"/>
|
||||
|
|
Loading…
Reference in New Issue