解决冲突

This commit is contained in:
zhangyuanyuan1 2022-08-09 17:19:28 +08:00
commit c2ef891419
24 changed files with 924 additions and 447 deletions

View File

@ -306,7 +306,7 @@ void MainWindow::initTrayIcon()
m_showMainwindowAction = new QAction(tr("Show MainWindow"),this);
m_showSettingsAction = new QAction(tr("Settings"),this);
m_trayIcon->setToolTip(QString(tr("kylin-nm")));
m_trayIcon->setToolTip(QString(tr("Network tool")));
m_showSettingsAction->setIcon(QIcon::fromTheme("document-page-setup-symbolic", QIcon(":/res/x/setup.png")) );
// m_trayIconMenu->addAction(m_showMainwindowAction);
m_trayIconMenu->addAction(m_showSettingsAction);

View File

@ -60,14 +60,13 @@ void ConfigPage::initUi()
//网络配置文件类型
m_descriptionLabel->setText(tr("Network profile type"));
m_descriptionLabel->setAlignment(Qt::AlignLeft);
//公用(推荐)无法在网络上发现你的设备。在大多数情况下,在家庭、工作或公共位置连接到网络时使用此功能
m_publicLabel->setText(tr("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."));
//公用(推荐) 网络中的设备不可发现此电脑。一般情况下适用于公共场所中的网络,如机场或咖啡店等等
m_publicLabel->setText(tr("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."));
m_publicLabel->setWordWrap(true);
//专用 可在网络上发现你的设备。如果需要文件共享或使用通过此网络通信的应用,请选择此项。你应该了解并信任网络上的人员和设备。
m_privateLabel->setText(tr("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."));
//专用 网络中的设备可发现此电脑。一般情况下适用于家庭或工作单位的网络,您认识并信任网络上的个人和设备。
m_privateLabel->setText(tr("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);
//配置防火墙和安全设置
m_congigBtn->setText(tr("Config firewall and security settings"));

View File

@ -24,8 +24,9 @@
#define ITEM_HEIGHT 36
#define ITEM_MARGINS 18,0,16,0
#define MAX_LABEL_WIDTH 138
#define MIN_LABEL_WIDTH 150
#define MAX_LABEL_WIDTH 154
#define MAX_WIDGET_WIDTH 270
FixLabel::FixLabel(QWidget *parent) :
QLabel(parent)
@ -83,6 +84,7 @@ void DetailWidget::initUI()
m_mainLayout->setContentsMargins(ITEM_MARGINS);
m_keyLabel = new FixLabel(this);
m_keyLabel->setMinimumWidth(MIN_LABEL_WIDTH);
m_keyLabel->setMaximumWidth(MAX_LABEL_WIDTH);
m_keyLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
@ -94,13 +96,10 @@ void DetailWidget::initUI()
m_mainLayout->addWidget(m_copyButton);
}
m_mainLayout->addWidget(m_valueWidget);
m_valueWidget->setMaximumWidth(100000000000);
m_valueWidget->setMaximumWidth(MAX_WIDGET_WIDTH);
}
void DetailWidget::setKey(const QString &keyLabel)
{
m_keyLabel->setText(keyLabel);
m_keyLabel->setLabelText(keyLabel);
}

View File

@ -25,6 +25,8 @@
#define LAYOUT_SPACING 0
#define HINT_TEXT_MARGINS 8, 1, 0, 3
#define LABEL_HEIGHT 24
#define FRAME_SPEED 150
#define ICON_SIZE 16,16
Ipv4Page::Ipv4Page(QWidget *parent):QFrame(parent)
{
@ -53,6 +55,7 @@ void Ipv4Page::initUI() {
m_addressHintLabel = new QLabel(this);
m_addressHintLabel->setFixedHeight(LABEL_HEIGHT);
m_addressHintLabel->setContentsMargins(HINT_TEXT_MARGINS);
initConflictHintLable();
m_maskHintLabel = new QLabel(this);
m_maskHintLabel->setFixedHeight(LABEL_HEIGHT);
@ -72,6 +75,12 @@ void Ipv4Page::initUI() {
m_dnsLabel->setText(tr("Prefs DNS"));
m_secDnsLabel->setText(tr("Alternative DNS"));
m_statusLabel = new QLabel(this);
m_statusLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
QHBoxLayout *pPwdLayout = new QHBoxLayout(ipv4addressEdit);
pPwdLayout->addStretch();
pPwdLayout->addWidget(m_statusLabel);
QPalette hintTextColor;
hintTextColor.setColor(QPalette::WindowText, Qt::red);
m_addressHintLabel->setPalette(hintTextColor);
@ -123,6 +132,8 @@ void Ipv4Page::initUI() {
netMaskEdit->setValidator(new QRegExpValidator(rx, this));
firstDnsEdit->setValidator(new QRegExpValidator(rx, this));
secondDnsEdit->setValidator(new QRegExpValidator(rx, this));
initLoadingIcon();
}
void Ipv4Page::initComponent() {
@ -134,6 +145,7 @@ void Ipv4Page::initComponent() {
connect(ipv4ConfigCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(configChanged(int)));
connect(ipv4addressEdit, SIGNAL(textChanged(QString)), this, SLOT(onAddressTextChanged()));
connect(ipv4addressEdit, SIGNAL(editingFinished()), this, SLOT(onAddressEidtFinished()));
connect(netMaskEdit, SIGNAL(textChanged(QString)), this, SLOT(onNetMaskTextChanged()));
connect(ipv4ConfigCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(setEnableOfSaveBtn()));
@ -279,6 +291,9 @@ void Ipv4Page::configChanged(int index) {
void Ipv4Page::onAddressTextChanged()
{
m_iconLabel->hide();
m_textLabel->hide();
if (!getTextEditState(ipv4addressEdit->text())) {
m_addressHintLabel->setText(tr("Invalid address"));
} else {
@ -295,6 +310,15 @@ void Ipv4Page::onNetMaskTextChanged()
}
}
void Ipv4Page::onAddressEidtFinished()
{
if (ipv4addressEdit->isModified()) {
if (!ipv4addressEdit->text().isEmpty() && getTextEditState(ipv4addressEdit->text())) {
Q_EMIT ipv4EditFinished(ipv4addressEdit->text());
}
}
}
void Ipv4Page::setLineEnabled(bool check) {
if (!check) {
@ -372,3 +396,65 @@ QString Ipv4Page::getNetMaskText(QString text)
}
return QString("%1.%2.%3.%4").arg(list[0],list[1],list[2],list[3]);
}
void Ipv4Page::initConflictHintLable()
{
QIcon icon = QIcon::fromTheme("dialog-warning");
m_iconLabel = new QLabel(m_addressHintLabel);
m_iconLabel->setPixmap(icon.pixmap(ICON_SIZE));
m_textLabel = new QLabel(m_addressHintLabel);
m_textLabel->setText(tr("Address conflict"));
QHBoxLayout *conflictHintLayout = new QHBoxLayout(m_addressHintLabel);
conflictHintLayout->setContentsMargins(0, 0, 0, 0);
conflictHintLayout->addWidget(m_iconLabel);
conflictHintLayout->addWidget(m_textLabel);
conflictHintLayout->addStretch();
m_addressHintLabel->setLayout(conflictHintLayout);
m_iconLabel->hide();
m_textLabel->hide();
}
void Ipv4Page::initLoadingIcon()
{
m_loadIcons.append(QIcon::fromTheme("ukui-loading-1-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-2-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-3-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-4-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-5-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-6-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-7-symbolic"));
m_iconTimer = new QTimer(this);
connect(m_iconTimer, &QTimer::timeout, this, &Ipv4Page::updateIcon);
}
void Ipv4Page::updateIcon()
{
if (m_currentIconIndex > 6) {
m_currentIconIndex = 0;
}
m_statusLabel->setPixmap(m_loadIcons.at(m_currentIconIndex).pixmap(ICON_SIZE));
m_currentIconIndex ++;
}
void Ipv4Page::startLoading()
{
m_iconTimer->start(FRAME_SPEED);
}
void Ipv4Page::stopLoading()
{
m_iconTimer->stop();
m_statusLabel->clear();
}
void Ipv4Page::showIpv4AddressConflict(bool isConflict)
{
if (isConflict) {
m_iconLabel->show();
m_textLabel->show();
} else {
m_iconLabel->hide();
m_textLabel->hide();
}
}

View File

@ -48,6 +48,10 @@ public:
bool checkIsChanged(const ConInfo info, KyConnectSetting &setting);
void startLoading();
void stopLoading();
void showIpv4AddressConflict(bool isConflict);
private:
QComboBox *ipv4ConfigCombox;
LineEdit *ipv4addressEdit;
@ -56,7 +60,6 @@ private:
LineEdit *firstDnsEdit;
LineEdit *secondDnsEdit;
private:
QFormLayout *m_detailLayout;
QVBoxLayout *mvBoxLayout;
QLabel *m_configLabel;
@ -71,6 +74,15 @@ private:
QLabel *m_maskHintLabel;
QLabel *m_gateWayEmptyLabel;
QLabel *m_firstDnsEmptyLabel;
QLabel *m_statusLabel = nullptr;
QList<QIcon> m_loadIcons;
QTimer *m_iconTimer = nullptr;
int m_currentIconIndex =0;
QLabel *m_iconLabel;
QLabel *m_textLabel;
private:
void initUI();
void initComponent();
@ -80,17 +92,20 @@ private:
bool netMaskIsValide(QString text);
QString getNetMaskText(QString text);
bool checkConnectBtnIsEnabled();
void initConflictHintLable();
void initLoadingIcon();
private slots:
void setEnableOfSaveBtn();
void configChanged(int index);
void onAddressTextChanged();
void onNetMaskTextChanged();
void onAddressEidtFinished();
void updateIcon();
Q_SIGNALS:
void setIpv4PageState(bool);
void ipv4EditFinished(const QString &address);
};
#endif // IPV4PAGE_H

View File

@ -24,6 +24,8 @@
#define LAYOUT_SPACING 0
#define HINT_TEXT_MARGINS 8, 1, 0, 3
#define LABEL_HEIGHT 24
#define FRAME_SPEED 150
#define ICON_SIZE 16,16
Ipv6Page::Ipv6Page(QWidget *parent):QFrame(parent)
{
@ -134,6 +136,7 @@ void Ipv6Page::initUI() {
m_addressHintLabel = new QLabel(this);
m_addressHintLabel->setFixedHeight(LABEL_HEIGHT);
m_addressHintLabel->setContentsMargins(HINT_TEXT_MARGINS);
initConflictHintLable();
m_gateWayHintLabel = new QLabel(this);
m_gateWayHintLabel->setFixedHeight(LABEL_HEIGHT);
@ -153,6 +156,12 @@ void Ipv6Page::initUI() {
m_dnsLabel->setText(tr("Prefs DNS"));
m_secDnsLabel->setText(tr("Alternative DNS"));
m_statusLabel = new QLabel(this);
m_statusLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
QHBoxLayout *pPwdLayout = new QHBoxLayout(ipv6AddressEdit);
pPwdLayout->addStretch();
pPwdLayout->addWidget(m_statusLabel);
QPalette hintTextColor;
hintTextColor.setColor(QPalette::WindowText, Qt::red);
m_addressHintLabel->setPalette(hintTextColor);
@ -196,6 +205,8 @@ void Ipv6Page::initUI() {
QRegExp prefix_rx("\\b(?:(?:12[0-8]|1[0-1][0-9]|^[1-9][0-9]?$)\\.){3}(?:12[0-8]|1[0-1][0-9]|^[1-9][0-9]?$)\\b");
lengthEdit->setValidator(new QRegExpValidator(prefix_rx,this));
initLoadingIcon();
}
void Ipv6Page::initComponent() {
@ -207,6 +218,7 @@ void Ipv6Page::initComponent() {
connect(ipv6ConfigCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(configChanged(int)));
connect(ipv6AddressEdit, SIGNAL(textChanged(QString)), this, SLOT(onAddressTextChanged()));
connect(ipv6AddressEdit, SIGNAL(editingFinished()), this, SLOT(onAddressEidtFinished()));
connect(gateWayEdit, SIGNAL(textChanged(QString)), this, SLOT(onGatewayTextChanged()));
connect(ipv6ConfigCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(setEnableOfSaveBtn()));
@ -258,6 +270,9 @@ void Ipv6Page::setEnableOfSaveBtn()
void Ipv6Page::onAddressTextChanged()
{
m_iconLabel->hide();
m_textLabel->hide();
if (!getIpv6EditState(ipv6AddressEdit->text())) {
m_addressHintLabel->setText(tr("Invalid address"));
} else {
@ -274,6 +289,15 @@ void Ipv6Page::onGatewayTextChanged()
}
}
void Ipv6Page::onAddressEidtFinished()
{
if (ipv6AddressEdit->isModified()) {
if (!ipv6AddressEdit->text().isEmpty() && getIpv6EditState(ipv6AddressEdit->text())) {
Q_EMIT ipv6EditFinished(ipv6AddressEdit->text());
}
}
}
bool Ipv6Page::checkConnectBtnIsEnabled()
{
if (ipv6ConfigCombox->currentIndex() == AUTO_CONFIG) {
@ -312,6 +336,23 @@ bool Ipv6Page::checkConnectBtnIsEnabled()
return true;
}
void Ipv6Page::initConflictHintLable()
{
QIcon icon = QIcon::fromTheme("dialog-warning");
m_iconLabel = new QLabel(m_addressHintLabel);
m_iconLabel->setPixmap(icon.pixmap(ICON_SIZE));
m_textLabel = new QLabel(m_addressHintLabel);
m_textLabel->setText(tr("Address conflict"));
QHBoxLayout *conflictHintLayout = new QHBoxLayout(m_addressHintLabel);
conflictHintLayout->setContentsMargins(0, 0, 0, 0);
conflictHintLayout->addWidget(m_iconLabel);
conflictHintLayout->addWidget(m_textLabel);
conflictHintLayout->addStretch();
m_addressHintLabel->setLayout(conflictHintLayout);
m_iconLabel->hide();
m_textLabel->hide();
}
bool Ipv6Page::getIpv6EditState(QString text)
{
if (text.isEmpty()) {
@ -348,3 +389,47 @@ int Ipv6Page::getPerfixLength(QString text)
return length;
}
void Ipv6Page::initLoadingIcon()
{
m_loadIcons.append(QIcon::fromTheme("ukui-loading-1-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-2-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-3-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-4-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-5-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-6-symbolic"));
m_loadIcons.append(QIcon::fromTheme("ukui-loading-7-symbolic"));
m_iconTimer = new QTimer(this);
connect(m_iconTimer, &QTimer::timeout, this, &Ipv6Page::updateIcon);
}
void Ipv6Page::updateIcon()
{
if (m_currentIconIndex > 6) {
m_currentIconIndex = 0;
}
m_statusLabel->setPixmap(m_loadIcons.at(m_currentIconIndex).pixmap(ICON_SIZE));
m_currentIconIndex ++;
}
void Ipv6Page::startLoading()
{
m_iconTimer->start(FRAME_SPEED);
}
void Ipv6Page::stopLoading()
{
m_iconTimer->stop();
m_statusLabel->clear();
}
void Ipv6Page::showIpv6AddressConflict(bool isConflict)
{
if (isConflict) {
m_iconLabel->show();
m_textLabel->show();
} else {
m_iconLabel->hide();
m_textLabel->hide();
}
}

View File

@ -50,6 +50,10 @@ public:
int getPerfixLength(QString text);
void startLoading();
void stopLoading();
void showIpv6AddressConflict(bool isConflict);
public:
QComboBox *ipv6ConfigCombox;
LineEdit *ipv6AddressEdit;
@ -71,6 +75,14 @@ private:
QLabel *m_subnetEmptyLabel;
QLabel *m_gateWayHintLabel;
QLabel *m_firstDnsEmptyLabel;
QLabel *m_statusLabel = nullptr;
QList<QIcon> m_loadIcons;
QTimer *m_iconTimer = nullptr;
int m_currentIconIndex =0;
QLabel *m_iconLabel;
QLabel *m_textLabel;
private:
void initUI();
void initComponent();
@ -80,14 +92,20 @@ private:
bool checkConnectBtnIsEnabled();
void initConflictHintLable();
void initLoadingIcon();
private slots:
void configChanged(int index);
void setEnableOfSaveBtn();
void onAddressTextChanged();
void onGatewayTextChanged();
void onAddressEidtFinished();
void updateIcon();
signals:
void setIpv6PageState(bool);
void ipv6EditFinished(const QString &address);
};
#endif // IPV6PAGE_H

View File

@ -70,7 +70,8 @@ void JoinHiddenWiFiPage::initUI()
m_secuWidget->setSecurity(KySecuType::WPA_AND_WPA2_PERSONAL);
m_descriptionLabel = new QLabel(this);
m_nameLabel = new QLabel(this);
m_nameLabel = new FixLabel(this);
m_nameLabel->setFixedWidth(LABEL_MIN_WIDTH);
m_nameEdit =new LineEdit(this);
m_bottomDivider = new Divider(this);
@ -131,7 +132,8 @@ void JoinHiddenWiFiPage::initUI()
QFont font = m_descriptionLabel->font();
font.setWeight(MEDIUM_WEIGHT_VALUE);
m_descriptionLabel->setFont(font);
m_nameLabel->setText(tr("Network name(SSID)")); //网络名(SSID)
m_nameLabel->setLabelText(tr("Network name(SSID)")); //网络名(SSID)
m_showListBtn->setText(tr("Show Network List")); //显示网络列表
m_cancelBtn->setText(tr("Cancel"));
m_joinBtn->setText(tr("Join"));

View File

@ -62,7 +62,7 @@ private:
SecurityPage *m_secuWidget;
QLabel *m_descriptionLabel;
QLabel *m_nameLabel;
FixLabel *m_nameLabel;
LineEdit *m_nameEdit;
Divider *m_bottomDivider = nullptr;

View File

@ -37,7 +37,8 @@
#define WINDOW_HEIGHT 602
#define ICON_SIZE 22,22
#define TITLE_LAYOUT_MARGINS 9,9,0,0
#define LAYOUT_MARGINS 0,0,0,0
#define CENTER_LAYOUT_MARGINS 24,0,0,0
#define BOTTOM_LAYOUT_MARGINS 24,0,24,0
#define BOTTOM_LAYOUT_SPACING 16
#define PAGE_LAYOUT_SPACING 1
#define DETAIL_PAGE_NUM 0
@ -49,6 +50,9 @@
#define PAGE_MIN_HEIGHT 40
#define LAN_TAB_WIDTH 180
#define WLAN_TAB_WIDTH 240
#define SCRO_WIDTH 472
#define PEAP_SCRO_HEIGHT 300
#define TLS_SCRO_HEIGHT 480
//extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
@ -89,6 +93,37 @@ void NetDetail::setNetdetailSomeEnable(bool on)
confimBtn->setEnabled(on);
}
void NetDetail::startObjectThread()
{
m_objectThread = new QThread();
m_object = new ThreadObject(m_deviceName);
m_object->moveToThread(m_objectThread);
connect(m_objectThread, &QThread::finished, m_objectThread, &QObject::deleteLater);
connect(m_objectThread, &QThread::finished, m_object, &QObject::deleteLater);
connect(ipv4Page, &Ipv4Page::ipv4EditFinished, this, [=](){
ipv4Page->startLoading();
});
connect(ipv6Page, &Ipv6Page::ipv6EditFinished, this, [=](){
ipv6Page->startLoading();
});
connect(ipv4Page, SIGNAL(ipv4EditFinished(const QString &)), m_object, SLOT(checkIpv4ConflictThread(const QString &)));
connect(ipv6Page, SIGNAL(ipv6EditFinished(const QString &)), m_object, SLOT(checkIpv6ConflictThread(const QString &)));
connect(this, SIGNAL(checkCurrentIpv4Conflict(const QString &)), m_object, SLOT(checkIpv4ConflictThread(const QString &)));
connect(this, SIGNAL(checkCurrentIpv6Conflict(const QString &)), m_object, SLOT(checkIpv6ConflictThread(const QString &)));
connect(m_object, &ThreadObject::ipv4IsConflict, this, [=](bool ipv4IsConf) {
ipv4Page->stopLoading();
ipv4Page->showIpv4AddressConflict(ipv4IsConf);
});
connect(m_object, &ThreadObject::ipv6IsConflict, this, [=](bool ipv6IsConf) {
ipv6Page->stopLoading();
ipv6Page->showIpv6AddressConflict(ipv6IsConf);
});
m_objectThread->start();
}
NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActive, bool isWlan, bool isCreateNet, QWidget *parent)
:m_deviceName(interface),
m_name(name),
@ -130,8 +165,9 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv
loadPage();
initComponent();
getConInfo(m_info);
startObjectThread();
pagePadding(name,isWlan);
setSecuPageHeight();
connect(qApp, &QApplication::paletteChanged, this, &NetDetail::onPaletteChanged);
isCreateOk = !(m_isCreateNet && !isWlan);
@ -150,7 +186,10 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv
NetDetail::~NetDetail()
{
if (m_objectThread->isRunning()) {
m_objectThread->quit();
m_objectThread->wait();
}
}
void NetDetail::onPaletteChanged()
@ -244,7 +283,8 @@ void NetDetail::centerToScreen()
void NetDetail::initUI()
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(24,9,24,24);
mainLayout->setContentsMargins(0,9,0,24);
mainLayout->setSpacing(24);
detailPage = new DetailPage(isWlan, m_name.isEmpty(), this);
@ -259,11 +299,25 @@ void NetDetail::initUI()
centerWidget = new QWidget(this);
bottomWidget = new QWidget(this);
m_secuPageScrollArea = new QScrollArea(this);
m_secuPageScrollArea->setFrameShape(QFrame::NoFrame);
m_secuPageScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_secuPageScrollArea->setWidget(securityPage);
QPalette pal = m_secuPageScrollArea->palette();
pal.setBrush(QPalette::Window, Qt::transparent);
m_secuPageScrollArea->setPalette(pal);
detailPage->setFixedWidth(SCRO_WIDTH);
ipv4Page->setFixedWidth(SCRO_WIDTH);
ipv6Page->setFixedWidth(SCRO_WIDTH);
createNetPage->setFixedWidth(SCRO_WIDTH);
configPage->setFixedWidth(SCRO_WIDTH);
stackWidget = new QStackedWidget(centerWidget);
stackWidget->addWidget(detailPage);
stackWidget->addWidget(ipv4Page);
stackWidget->addWidget(ipv6Page);
stackWidget->addWidget(securityPage);
stackWidget->addWidget(m_secuPageScrollArea);
stackWidget->addWidget(configPage);
stackWidget->addWidget(createNetPage);
@ -320,13 +374,13 @@ void NetDetail::initUI()
this->setWindowIcon(QIcon::fromTheme("kylin-network"));
QVBoxLayout *centerlayout = new QVBoxLayout(centerWidget);
centerlayout->setContentsMargins(LAYOUT_MARGINS);
centerlayout->setContentsMargins(CENTER_LAYOUT_MARGINS);
centerlayout->addWidget(pageFrame);
centerlayout->addSpacing(4);
centerlayout->addWidget(stackWidget);
QHBoxLayout *bottomLayout = new QHBoxLayout(bottomWidget);
bottomLayout->setContentsMargins(LAYOUT_MARGINS);
bottomLayout->setContentsMargins(BOTTOM_LAYOUT_MARGINS);
bottomLayout->setSpacing(BOTTOM_LAYOUT_SPACING);
bottomLayout->addWidget(forgetBtn);
bottomLayout->addStretch();
@ -394,6 +448,13 @@ void NetDetail::initComponent()
isSecuOk = status;
setConfirmEnable();
});
connect(securityPage, &SecurityPage::secuTypeChanged, this, [=]() {
setSecuPageHeight();
});
connect(securityPage, &SecurityPage::eapTypeChanged, this, [=]() {
setSecuPageHeight();
});
}
void NetDetail::pagePadding(QString netName, bool isWlan)
@ -417,6 +478,7 @@ void NetDetail::pagePadding(QString netName, bool isWlan)
//ipv4页面填充
if (m_info.ipv4ConfigType == CONFIG_IP_MANUAL) {
emit checkCurrentIpv4Conflict(m_info.strIPV4Address);
ipv4Page->setIpv4Config(m_info.ipv4ConfigType);
ipv4Page->setIpv4(m_info.strIPV4Address);
ipv4Page->setNetMask(m_info.strIPV4NetMask);
@ -428,6 +490,7 @@ void NetDetail::pagePadding(QString netName, bool isWlan)
}
//ipv6页面填充
if (m_info.ipv6ConfigType == CONFIG_IP_MANUAL) {
emit checkCurrentIpv6Conflict(m_info.strIPV6Address);
ipv6Page->setIpv6Config(m_info.ipv6ConfigType);
ipv6Page->setIpv6(m_info.strIPV6Address);
ipv6Page->setIpv6Perfix(m_info.iIPV6Prefix);
@ -455,12 +518,7 @@ void NetDetail::pagePadding(QString netName, bool isWlan)
//配置页面
if (isActive) {
int configType = NetworkModeConfig::getInstance()->getNetworkModeConfig(m_uuid);
if (configType == -1) {
configPage->setConfigState(KSC_FIREWALL_PUBLIC);
} else {
configPage->setConfigState(configType);
}
configPage->setConfigState(NetworkModeConfig::getInstance()->getNetworkModeConfig(m_uuid));
}
}
@ -660,6 +718,22 @@ void NetDetail::initSecuData()
}
}
void NetDetail::setSecuPageHeight()
{
KySecuType secuType;
KyEapMethodType eapType;
securityPage->getSecuType(secuType, eapType);
if (secuType == WPA_AND_WPA2_ENTERPRISE) {
if (eapType == TLS) {
securityPage->setFixedSize(SCRO_WIDTH, TLS_SCRO_HEIGHT);
} else {
securityPage->setFixedSize(SCRO_WIDTH, PEAP_SCRO_HEIGHT);
}
} else {
securityPage->setFixedSize(SCRO_WIDTH, PEAP_SCRO_HEIGHT);
}
}
void NetDetail::initTlsInfo(ConInfo &conInfo)
{
m_resource->getEnterPriseInfoTls(m_uuid, conInfo.tlsInfo);
@ -734,6 +808,7 @@ void NetDetail::setConfirmEnable()
confimBtn->setEnabled(isConfirmBtnEnable);
}
#if 0
bool NetDetail::checkIpv4Conflict(QString ipv4Address)
{
showDesktopNotify(tr("start check ipv4 address conflict"), "networkwrong");
@ -767,6 +842,7 @@ bool NetDetail::checkIpv6Conflict(QString ipv6address)
ipv46rping = nullptr;
return isConflict;
}
#endif
void NetDetail::updateWirelessPersonalConnect()
{
@ -796,13 +872,13 @@ bool NetDetail::createWiredConnect()
KyWirelessConnectSetting connetSetting;
connetSetting.setIfaceName(m_deviceName);
createNetPage->constructIpv4Info(connetSetting);
if (connetSetting.m_ipv4ConfigIpType != CONFIG_IP_DHCP) {
if (checkIpv4Conflict(connetSetting.m_ipv4Address.at(0).ip().toString())) {
qDebug() << "ipv4 conflict";
showDesktopNotify(tr("ipv4 address conflict!"), "networkwrong");
return false;
}
}
// if (connetSetting.m_ipv4ConfigIpType != CONFIG_IP_DHCP) {
// if (checkIpv4Conflict(connetSetting.m_ipv4Address.at(0).ip().toString())) {
// qDebug() << "ipv4 conflict";
// showDesktopNotify(tr("ipv4 address conflict!"), "networkwrong");
// return false;
// }
// }
m_wiredConnOperation->createWiredConnect(connetSetting);
return true;
}
@ -847,21 +923,21 @@ bool NetDetail::createWirelessConnect()
connetSetting.dumpInfo();
qDebug() << "ipv4Changed" << ipv4Change << "ipv6Change" << ipv6Change;
if (ipv4Change && connetSetting.m_ipv4ConfigIpType == CONFIG_IP_MANUAL) {
if (checkIpv4Conflict(connetSetting.m_ipv4Address.at(0).ip().toString())) {
qDebug() << "ipv4 conflict";
showDesktopNotify(tr("ipv4 address conflict!"), "networkwrong");
return false;
}
}
// if (ipv4Change && connetSetting.m_ipv4ConfigIpType == CONFIG_IP_MANUAL) {
// if (checkIpv4Conflict(connetSetting.m_ipv4Address.at(0).ip().toString())) {
// qDebug() << "ipv4 conflict";
// showDesktopNotify(tr("ipv4 address conflict!"), "networkwrong");
// return false;
// }
// }
if (ipv6Change && connetSetting.m_ipv6ConfigIpType == CONFIG_IP_MANUAL) {
if (checkIpv6Conflict(connetSetting.m_ipv6Address.at(0).ip().toString())) {
qDebug() << "ipv6 conflict";
showDesktopNotify(tr("ipv6 address conflict!"), "networkwrong");
return false;
}
}
// if (ipv6Change && connetSetting.m_ipv6ConfigIpType == CONFIG_IP_MANUAL) {
// if (checkIpv6Conflict(connetSetting.m_ipv6Address.at(0).ip().toString())) {
// qDebug() << "ipv6 conflict";
// showDesktopNotify(tr("ipv6 address conflict!"), "networkwrong");
// return false;
// }
// }
//wifi安全性
if (secuType == WPA_AND_WPA2_ENTERPRISE) {
connetSetting.m_type = WpaEap;
@ -935,21 +1011,21 @@ bool NetDetail::updateConnect()
qDebug() << "ipv4Changed" << ipv4Change << "ipv6Change" << ipv6Change;
if (ipv4Change && connetSetting.m_ipv4ConfigIpType == CONFIG_IP_MANUAL) {
if (checkIpv4Conflict(connetSetting.m_ipv4Address.at(0).ip().toString())) {
qDebug() << "ipv4 conflict";
showDesktopNotify(tr("ipv4 address conflict!"), "networkwrong");
return false;
}
}
// if (ipv4Change && connetSetting.m_ipv4ConfigIpType == CONFIG_IP_MANUAL) {
// if (checkIpv4Conflict(connetSetting.m_ipv4Address.at(0).ip().toString())) {
// qDebug() << "ipv4 conflict";
// showDesktopNotify(tr("ipv4 address conflict!"), "networkwrong");
// return false;
// }
// }
if (ipv6Change && connetSetting.m_ipv6ConfigIpType == CONFIG_IP_MANUAL) {
if (checkIpv6Conflict(connetSetting.m_ipv6Address.at(0).ip().toString())) {
qDebug() << "ipv6 conflict";
showDesktopNotify(tr("ipv6 address conflict!"), "networkwrong");
return false;
}
}
// if (ipv6Change && connetSetting.m_ipv6ConfigIpType == CONFIG_IP_MANUAL) {
// if (checkIpv6Conflict(connetSetting.m_ipv6Address.at(0).ip().toString())) {
// qDebug() << "ipv6 conflict";
// showDesktopNotify(tr("ipv6 address conflict!"), "networkwrong");
// return false;
// }
// }
if (ipv4Change || ipv6Change) {
connetSetting.dumpInfo();
@ -1053,3 +1129,57 @@ QSize NetTabBar::minimumTabSizeHint(int index) const
Q_UNUSED(index)
return QSize(TAB_WIDTH, TAB_HEIGHT);
}
ThreadObject::ThreadObject(QString deviceName, QObject *parent)
:m_devName(deviceName), QObject(parent)
{
m_isStop = false;
}
ThreadObject::~ThreadObject()
{
}
void ThreadObject::stop()
{
m_isStop = true;
}
void ThreadObject::checkIpv4ConflictThread(const QString &ipv4Address)
{
if (m_isStop) {
return;
}
bool isConflict = false;
KyIpv4Arping* ipv4Arping = new KyIpv4Arping(m_devName, ipv4Address);
if (ipv4Arping->ipv4ConflictCheck() >= 0) {
isConflict = ipv4Arping->ipv4IsConflict();
} else {
qWarning() << "checkIpv4Conflict internal error";
}
delete ipv4Arping;
ipv4Arping = nullptr;
emit ipv4IsConflict(isConflict);
}
void ThreadObject::checkIpv6ConflictThread(const QString &ipv6Address)
{
if (m_isStop) {
return;
}
bool isConflict = false;
KyIpv6Arping* ipv6rping = new KyIpv6Arping(m_devName, ipv6Address);
if (ipv6rping->ipv6ConflictCheck() >= 0) {
isConflict = ipv6rping->ipv6IsConflict();
} else {
qWarning() << "checkIpv6Conflict internal error";
}
delete ipv6rping;
ipv6rping = nullptr;
emit ipv6IsConflict(isConflict);
}

View File

@ -32,6 +32,7 @@
#include <QApplication>
#include <QDebug>
#include <QSettings>
#include <QThread>
#include <QDBusMessage>
#include <QDBusObjectPath>
@ -65,6 +66,25 @@ public:
QSize sizeHint() const;
QSize minimumTabSizeHint(int index) const;
};
class ThreadObject : public QObject
{
Q_OBJECT
public:
ThreadObject(QString deviceName, QObject *parent = nullptr);
~ThreadObject();
void stop();
private:
QString m_devName;
volatile bool m_isStop;
public slots:
void checkIpv4ConflictThread(const QString &ipv4Address);
void checkIpv6ConflictThread(const QString &ipv6Address);
signals:
bool ipv4IsConflict(bool isConflict);
bool ipv6IsConflict(bool isConflict);
};
class NetDetail : public QWidget
{
@ -86,6 +106,7 @@ private:
void loadPage();
void pagePadding(QString netName, bool isWlan);
void initSecuData();
void setSecuPageHeight();
void initTlsInfo(ConInfo &conInfo);
void initPeapInfo(ConInfo &conInfo);
@ -103,8 +124,8 @@ private:
void setConfirmEnable();
bool checkIpv4Conflict(QString ipv4Address);
bool checkIpv6Conflict(QString ipv6Address);
// bool checkIpv4Conflict(QString ipv4Address);
// bool checkIpv6Conflict(QString ipv6Address);
bool createWiredConnect();
bool createWirelessConnect();
@ -115,6 +136,8 @@ private:
void showDesktopNotify(const QString &message, QString soundName);
void setNetdetailSomeEnable(bool on);
void startObjectThread();
private:
KyNetworkDeviceResourse *m_netDeviceResource = nullptr;
KyConnectOperation* m_connectOperation = nullptr;
@ -133,6 +156,7 @@ private:
QWidget * centerWidget;
QWidget * bottomWidget;
QScrollArea * m_secuPageScrollArea;
QPushButton * cancelBtn;
QPushButton * forgetBtn;
@ -159,6 +183,9 @@ private:
ConInfo m_info;
ThreadObject *m_object;
QThread *m_objectThread;
private slots:
void on_btnConfirm_clicked();
void on_btnForget_clicked();
@ -171,8 +198,8 @@ signals:
void detailPageClose(bool on);
void createPageClose(QString);
void currentChanged(int);
void checkCurrentIpv4Conflict(const QString &address);
void checkCurrentIpv6Conflict(const QString &address);
};
#endif // NETDETAIL_H

View File

@ -45,13 +45,18 @@ void SecurityPage::initUI()
domainLable = new QLabel(this);
caCertPathLabel = new QLabel(this);
caNeedFlagLabel = new QLabel(this);
clientCertPathLabel = new QLabel(this);
clientPrivateKeyLabel = new QLabel(this);
clientPrivateKeyPwdLabel = new QLabel(this);
pwdOptionLabel = new QLabel(this);
clientCertPathLabel = new FixLabel(this);
clientCertPathLabel->setFixedWidth(MIN_LABEL_WIDTH);
clientPrivateKeyLabel = new FixLabel(this);
clientPrivateKeyLabel->setFixedWidth(MIN_LABEL_WIDTH);
clientPrivateKeyPwdLabel = new FixLabel(this);
clientPrivateKeyPwdLabel->setFixedWidth(MIN_LABEL_WIDTH);
pwdOptionLabel = new FixLabel(this);
pwdOptionLabel->setFixedWidth(MIN_LABEL_WIDTH);
//PEAP TTLS共有
eapMethodLabel = new QLabel(this);
eapMethodLabel = new FixLabel(this);
eapMethodLabel->setFixedWidth(MIN_LABEL_WIDTH);
userNameLabel = new QLabel(this);
userPwdLabel = new QLabel(this);
userPwdFlagLabel = new QLabel(this);
@ -205,15 +210,15 @@ void SecurityPage::initUI()
domainLable->setText(tr("Domain"));
caCertPathLabel->setText(tr("CA certficate"));
caNeedFlagLabel->setText(tr("no need for CA certificate"));
clientCertPathLabel->setText(tr("User certificate"));
clientPrivateKeyLabel->setText(tr("User private key"));
clientPrivateKeyPwdLabel->setText(tr("User key password"));
pwdOptionLabel->setText(tr("Password options"));
clientCertPathLabel->setLabelText(tr("User certificate"));
clientPrivateKeyLabel->setLabelText(tr("User private key"));
clientPrivateKeyPwdLabel->setLabelText(tr("User key password"));
pwdOptionLabel->setLabelText(tr("Password options"));
identityEdit->setPlaceholderText(tr("Required"));
clientPrivateKeyPwdEdit->setPlaceholderText(hintRequired);
//PEAP TTLS共有
eapMethodLabel->setText(tr("Ineer authentication"));
eapMethodLabel->setLabelText(tr("Ineer authentication"));
userNameLabel->setText(tr("Usename"));
userPwdLabel->setText(tr("Password"));
userPwdFlagLabel->setText(tr("Ask pwd each query"));

View File

@ -28,6 +28,7 @@
#include <QCheckBox>
#include "coninfo.h"
#include "detailwidget.h"
#include "kwidget.h"
#include "kpasswordedit.h"
@ -70,13 +71,13 @@ private:
QLabel *domainLable;
QLabel *caCertPathLabel;
QLabel *caNeedFlagLabel;
QLabel *clientCertPathLabel;
QLabel *clientPrivateKeyLabel;
QLabel *clientPrivateKeyPwdLabel;
QLabel *pwdOptionLabel;
FixLabel *clientCertPathLabel;
FixLabel *clientPrivateKeyLabel;
FixLabel *clientPrivateKeyPwdLabel;
FixLabel *pwdOptionLabel;
//PEAP TTLS共有
QLabel *eapMethodLabel;
FixLabel *eapMethodLabel;
QLabel *userNameLabel;
QLabel *userPwdLabel;
QLabel *userPwdFlagLabel;

View File

@ -46,7 +46,7 @@ void FirewallDialog::initUI()
QWidget *contentWidget = new QWidget(this);
QGridLayout *contentLayout = new QGridLayout(contentWidget);
contentLayout->setContentsMargins(0, 0, 0, 0);
contentLayout->addWidget(m_iconLabel, 0, 0, Qt::AlignTop);
contentLayout->addWidget(m_iconLabel, 0, 0, Qt::AlignVCenter);
contentLayout->addWidget(m_contentLabel, 0, 1);
contentLayout->addWidget(m_suggestLabel, 1, 1);
m_iconLabel->setFixedWidth(16);
@ -59,7 +59,7 @@ void FirewallDialog::initUI()
btnLayout->addWidget(m_YesBtn);
btnLayout->addWidget(m_NoBtn);
m_dialogLayout->setContentsMargins(24, 0, 24, 24);
m_dialogLayout->setContentsMargins(24, 16, 24, 24);
m_dialogLayout->setSpacing(0);
m_dialogLayout->addWidget(contentWidget);
m_dialogLayout->addStretch();
@ -69,17 +69,17 @@ void FirewallDialog::initUI()
m_iconLabel->setPixmap(icon.pixmap(ICON_SIZE));
QFont font = m_contentLabel->font();
font.setWeight(75);
font.setWeight(57);
m_contentLabel->setFont(font);
//是否允许你的电脑被此网络上的其他电脑和设备发现?
m_contentLabel->setText(tr("Allow your computer to be discovered by other computers and devices on this network"));
//是否允许此网络上的其他设备发现这台电脑
m_contentLabel->setText(tr("Allow other devices on this network to discover this computer?"));
m_contentLabel->setWordWrap(true);
//建议家庭和工作网络上而非公共网络上启此功能
m_suggestLabel->setText(tr("It is recommended that you enable this feature on your home and work networks rather than public networks."));
//建议在公共网络上启此功能
m_suggestLabel->setText(tr("It is not recommended to enable this feature on public networks"));
m_suggestLabel->setWordWrap(true);
m_YesBtn->setText(tr("Yse"));
m_NoBtn->setText(tr("No"));
m_YesBtn->setText(tr("Not allowed (recommended)"));
m_NoBtn->setText(tr("Allowed"));
this->closeButton();
this->mainWidget()->setLayout(m_dialogLayout);

View File

@ -35,10 +35,13 @@ class FirewallDialog : public KDialog
public:
explicit FirewallDialog(KDialog *parent = nullptr);
~FirewallDialog();
void setUuid(QString uuid) {
m_uuid = uuid;
}
private:
void initUI();
QString m_uuid;
QLabel * m_iconLabel = nullptr;
QLabel * m_contentLabel = nullptr;
QLabel * m_suggestLabel = nullptr;
@ -49,5 +52,12 @@ private:
signals:
void setPublicNetMode();
void setPrivateNetMode();
public slots:
void closeMyself(QString uuid, int status) {
if (uuid == m_uuid && status == 4) {
this->close();
}
}
};
#endif // FIREWALLDIALOG_H

View File

@ -381,6 +381,19 @@ void LanPage::constructActiveConnectionArea()
QListWidgetItem *p_listWidgetItem = addNewItem(p_activeConnectionItem, m_activatedLanListWidget);
m_activeConnectionMap.insert(p_activeConnectionItem->m_connectUuid, p_listWidgetItem);
int configType = NetworkModeConfig::getInstance()->getNetworkModeConfig(p_activeConnectionItem->m_connectUuid);
if (configType == -1) {
NetworkModeConfig::getInstance()->setNetworkModeConfig(p_activeConnectionItem->m_connectUuid,
m_currentDeviceName,
p_activeConnectionItem->m_connectName,
KSC_FIREWALL_PUBLIC);
} else {
NetworkModeConfig::getInstance()->setNetworkModeConfig(p_activeConnectionItem->m_connectUuid,
m_currentDeviceName,
p_activeConnectionItem->m_connectName,
configType);
}
delete p_activeConnectionItem;
p_activeConnectionItem = nullptr;
}
@ -928,6 +941,10 @@ void LanPage::onConnectionStateChange(QString uuid,
sendLanStateChangeSignal(uuid, (ConnectState)state);
if (m_activeConnectionMap.keys().contains(uuid) && state == NetworkManager::ActiveConnection::State::Activated) {
return;
}
qDebug()<<"[LanPage] connection uuid"<< uuid
<< "state change slot:"<< state;
@ -948,23 +965,24 @@ void LanPage::onConnectionStateChange(QString uuid,
int configType = NetworkModeConfig::getInstance()->getNetworkModeConfig(uuid);
if (configType == -1) {
FirewallDialog *fireWallDiaglog = new FirewallDialog();
fireWallDiaglog->setWindowTitle(p_newItem->m_connectName);
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, deviceName, ssid, KSC_FIREWALL_PUBLIC); //默认公有配置
FirewallDialog *fireWallDialog = new FirewallDialog();
fireWallDialog->setUuid(uuid);
fireWallDialog->setWindowTitle(ssid);
connect(fireWallDiaglog, &FirewallDialog::setPrivateNetMode, this, [=](){
fireWallDiaglog->close();
connect(fireWallDialog, &FirewallDialog::setPrivateNetMode, this, [=](){
fireWallDialog->hide();
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, deviceName, ssid, KSC_FIREWALL_PRIVATE);
});
connect(fireWallDiaglog, &FirewallDialog::setPublicNetMode, this, [=](){
fireWallDiaglog->close();
connect(fireWallDialog, &FirewallDialog::setPublicNetMode, this, [=](){
fireWallDialog->hide();
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, deviceName, ssid, KSC_FIREWALL_PUBLIC);
});
connect(fireWallDiaglog, &FirewallDialog::close, this, [=](){
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, deviceName, ssid, KSC_FIREWALL_PUBLIC);
});
fireWallDiaglog->show();
connect(m_activeResourse, &KyActiveConnectResourse::stateChangeReason, fireWallDialog, &FirewallDialog::closeMyself);
fireWallDialog->show();
} else if (configType == KSC_FIREWALL_PUBLIC) {
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, deviceName, ssid, KSC_FIREWALL_PUBLIC);
} else if (configType == KSC_FIREWALL_PRIVATE) {

View File

@ -425,6 +425,19 @@ void WlanPage::constructActivateConnectionArea()
m_activateConnectionItemMap.insert(wirelessNetItem.m_NetSsid, p_listWidgetItem);
updateWlanItemState(m_activatedNetListWidget, p_listWidgetItem, Activated);
int configType = NetworkModeConfig::getInstance()->getNetworkModeConfig(wirelessNetItem.m_connectUuid);
if (configType == -1) {
NetworkModeConfig::getInstance()->setNetworkModeConfig(wirelessNetItem.m_connectUuid,
m_currentDevice,
wirelessNetItem.m_connName,
KSC_FIREWALL_PUBLIC);
} else {
NetworkModeConfig::getInstance()->setNetworkModeConfig(wirelessNetItem.m_connectUuid,
m_currentDevice,
wirelessNetItem.m_connName,
configType);
}
height += p_listWidgetItem->sizeHint().height();
}
}
@ -942,24 +955,25 @@ void WlanPage::onConnectionStateChanged(QString uuid,
if (!isApConnection) {
int configType = NetworkModeConfig::getInstance()->getNetworkModeConfig(uuid);
if (configType == -1) {
FirewallDialog *fireWallDiaglog = new FirewallDialog();
fireWallDiaglog->setWindowTitle(ssid);
connect(fireWallDiaglog, &FirewallDialog::setPrivateNetMode, this, [=](){
fireWallDiaglog->close();
if (configType == -1) {
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, devName, ssid, KSC_FIREWALL_PUBLIC); //默认公有配置
FirewallDialog *fireWallDialog = new FirewallDialog(); //弹窗 供用户配置
fireWallDialog->setUuid(uuid);
fireWallDialog->setWindowTitle(ssid);
connect(fireWallDialog, &FirewallDialog::setPrivateNetMode, this, [=](){
fireWallDialog->hide();
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, devName, ssid, KSC_FIREWALL_PRIVATE);
});
connect(fireWallDiaglog, &FirewallDialog::setPublicNetMode, this, [=](){
fireWallDiaglog->close();
connect(fireWallDialog, &FirewallDialog::setPublicNetMode, this, [=](){
fireWallDialog->hide();
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, devName, ssid, KSC_FIREWALL_PUBLIC);
});
connect(fireWallDiaglog, &FirewallDialog::close, this, [=](){
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, devName, ssid, KSC_FIREWALL_PUBLIC);
});
connect(m_activatedConnectResource, &KyActiveConnectResourse::stateChangeReason, fireWallDialog, &FirewallDialog::closeMyself);
fireWallDiaglog->show();
fireWallDialog->show();
} else if (configType == KSC_FIREWALL_PUBLIC) {
NetworkModeConfig::getInstance()->setNetworkModeConfig(uuid, devName, ssid, KSC_FIREWALL_PUBLIC);

View File

@ -10,16 +10,16 @@
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="64"/>
<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>
<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 type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="68"/>
<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>
<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>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="73"/>
<location filename="../src/frontend/netdetails/configpage.cpp" line="72"/>
<source>Config firewall and security settings</source>
<translation type="unfinished"></translation>
</message>
@ -176,144 +176,154 @@
<context>
<name>FirewallDialog</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="389"/>
<source>Allow your computer to be discovered by other computers and devices on this network</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="75"/>
<source>Allow other devices on this network to discover this computer?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="392"/>
<source>It is recommended that you enable this feature on your home and work networks rather than public networks.</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="78"/>
<source>It is not recommended to enable this feature on public networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="395"/>
<source>Yse</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="81"/>
<source>Not allowed (recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="396"/>
<source>No</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="82"/>
<source>Allowed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ipv4Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="68"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<source>Ipv4Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="69"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="70"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<source>Netmask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="74"/>
<source>Default Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="75"/>
<source>Prefs DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="76"/>
<source>Alternative DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="107"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="116"/>
<source>Auto(DHCP)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="108"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="117"/>
<source>Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="283"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="295"/>
<source>Invalid address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="292"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="305"/>
<source>Invalid subnet mask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="311"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="312"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="324"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="325"/>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="396"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ipv6Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="149"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<source>Ipv6Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="150"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<source>Subnet prefix Length</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<source>Default Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="155"/>
<source>Prefs DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="156"/>
<source>Alternative DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="188"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="190"/>
<source>Auto(DHCP)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="189"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="191"/>
<source>Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="242"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="243"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="244"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="245"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="246"/>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="262"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="264"/>
<source>Invalid address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="271"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="273"/>
<source>Invalid gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="323"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>JoinHiddenWiFiPage</name>
@ -386,27 +396,27 @@
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1235"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1236"/>
<source>No ethernet device avaliable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="754"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="755"/>
<source>LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="756"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="757"/>
<source>Activated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="765"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="766"/>
<source>Inactivated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1259"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1260"/>
<source>Wired Device not carried</source>
<translation type="unfinished"></translation>
</message>
@ -428,7 +438,6 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="188"/>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>kylin-nm</source>
<translation type="unfinished"></translation>
</message>
@ -447,6 +456,11 @@
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>Network tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="306"/>
<source>Show MainWindow</source>
@ -456,120 +470,107 @@
<context>
<name>NetDetail</name>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="68"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="69"/>
<source>Kylin NM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="71"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="72"/>
<source>kylin network desktop message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="282"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<source>Detail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<source>Ipv4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="285"/>
<source>Ipv6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="286"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="287"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="288"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="295"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="289"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="296"/>
<source>Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="311"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="312"/>
<source>Confirm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="314"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="315"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="317"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="318"/>
<source>Forget this network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="348"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="349"/>
<source>Add Lan Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="353"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="354"/>
<source>connect hiddin wlan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="509"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="521"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1001"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="511"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="523"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1006"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="620"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="621"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="622"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="624"/>
<source>Auto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="738"/>
<source>start check ipv4 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="755"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="760"/>
<source>start check ipv6 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="801"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="852"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="940"/>
<source>ipv4 address conflict!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="860"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="948"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="865"/>
<source>ipv6 address conflict!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="997"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<source>this wifi no support enterprise type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<source>this wifi no support None type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1012"/>
<source>this wifi no support WPA2 type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1010"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1015"/>
<source>this wifi no support WPA3 type</source>
<translation type="unfinished"></translation>
</message>
@ -869,32 +870,32 @@
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="104"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="105"/>
<source>WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="106"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="107"/>
<source>Activated WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="116"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="117"/>
<source>Other WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="90"/>
<source>No wireless network card detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="824"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="825"/>
<source>WLAN Connected Successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="820"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="821"/>
<source>WLAN Disconnected Successfully</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View File

@ -41,16 +41,24 @@
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="64"/>
<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>() .</translation>
<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>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="68"/>
<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> .</translation>
<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>
<translation> .</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="73"/>
<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>
<translation></translation>
</message>
@ -456,144 +464,170 @@
<context>
<name>FirewallDialog</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="389"/>
<source>Allow your computer to be discovered by other computers and devices on this network</source>
<translation>?</translation>
<translation type="vanished">?</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="392"/>
<source>It is recommended that you enable this feature on your home and work networks rather than public networks.</source>
<translation>.</translation>
<translation type="vanished">.</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="395"/>
<source>Yse</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="396"/>
<source>No</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="75"/>
<source>Allow other devices on this network to discover this computer?</source>
<translation>?</translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="78"/>
<source>It is not recommended to enable this feature on public networks</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="81"/>
<source>Not allowed (recommended)</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="82"/>
<source>Allowed</source>
<translation></translation>
</message>
</context>
<context>
<name>Ipv4Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="68"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<source>Ipv4Config</source>
<translation>Ipv4ཁུང</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="69"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<source>Address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="70"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<source>Netmask</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="74"/>
<source>Default Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="75"/>
<source>Prefs DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="76"/>
<source>Alternative DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="107"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="116"/>
<source>Auto(DHCP)</source>
<translation>(DHCP)</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="108"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="117"/>
<source>Manual</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="283"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="295"/>
<source>Invalid address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="292"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="305"/>
<source>Invalid subnet mask</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="311"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="312"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="324"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="325"/>
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="396"/>
<source>Address conflict</source>
<translation></translation>
</message>
</context>
<context>
<name>Ipv6Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="149"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<source>Ipv6Config</source>
<translation>Ipv6ཁུང</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="150"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<source>Address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<source>Subnet prefix Length</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<source>Default Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="155"/>
<source>Prefs DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="156"/>
<source>Alternative DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="188"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="190"/>
<source>Auto(DHCP)</source>
<translation>(DHCP)</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="189"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="191"/>
<source>Manual</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="242"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="243"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="244"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="245"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="246"/>
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="262"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="264"/>
<source>Invalid address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="271"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="273"/>
<source>Invalid gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="323"/>
<source>Address conflict</source>
<translation></translation>
</message>
</context>
<context>
<name>JoinHiddenWiFiPage</name>
@ -666,22 +700,22 @@
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1235"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1236"/>
<source>No ethernet device avaliable</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="754"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="755"/>
<source>LAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="756"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="757"/>
<source>Activated LAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="765"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="766"/>
<source>Inactivated LAN</source>
<translation></translation>
</message>
@ -690,7 +724,7 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1259"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1260"/>
<source>Wired Device not carried</source>
<translation></translation>
</message>
@ -716,7 +750,6 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="188"/>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>kylin-nm</source>
<translation></translation>
</message>
@ -743,36 +776,41 @@
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>Network tool</source>
<translation></translation>
</message>
</context>
<context>
<name>NetDetail</name>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="68"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="69"/>
<source>Kylin NM</source>
<translation>NM</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="71"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="72"/>
<source>kylin network desktop message</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="282"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<source>Detail</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<source>Ipv4</source>
<translation>Ipv4</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="285"/>
<source>Ipv6</source>
<translation>Ipv6</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="286"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="287"/>
<source>Security</source>
<translation></translation>
</message>
@ -781,90 +819,85 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="288"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="295"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="289"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="296"/>
<source>Config</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="311"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="312"/>
<source>Confirm</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="314"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="315"/>
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="317"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="318"/>
<source>Forget this network</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="348"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="349"/>
<source>Add Lan Connect</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="353"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="354"/>
<source>connect hiddin wlan</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="509"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="521"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1001"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="511"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="523"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1006"/>
<source>None</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="620"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="621"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="622"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="624"/>
<source>Auto</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="738"/>
<source>start check ipv4 address conflict</source>
<translation>ipv4ས</translation>
<translation type="vanished">ipv4ས</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="755"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="760"/>
<source>start check ipv6 address conflict</source>
<translation>ipv6གནས</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="801"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="852"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="940"/>
<source>ipv4 address conflict!</source>
<translation>ipv4ཐག!</translation>
<translation type="vanished">ipv4ཐག!</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="860"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="948"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="865"/>
<source>ipv6 address conflict!</source>
<translation>ipv6ཐག!</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="997"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<source>this wifi no support enterprise type</source>
<translation>wifiལ</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<source>this wifi no support None type</source>
<translation>wifiལ</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1012"/>
<source>this wifi no support WPA2 type</source>
<translation>wifiལWPA2རིགས</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1010"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1015"/>
<source>this wifi no support WPA3 type</source>
<translation>wifiལWPA3རིགས</translation>
</message>
@ -1260,22 +1293,22 @@
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="104"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="105"/>
<source>WLAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="90"/>
<source>No wireless network card detected</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="106"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="107"/>
<source>Activated WLAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="116"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="117"/>
<source>Other WLAN</source>
<translation></translation>
</message>
@ -1284,12 +1317,12 @@
<translation type="vanished">...</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="824"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="825"/>
<source>WLAN Connected Successfully</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="820"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="821"/>
<source>WLAN Disconnected Successfully</source>
<translation></translation>
</message>

Binary file not shown.

View File

@ -108,16 +108,16 @@
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="64"/>
<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>
<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 type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="68"/>
<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>
<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>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="73"/>
<location filename="../src/frontend/netdetails/configpage.cpp" line="72"/>
<source>Config firewall and security settings</source>
<translation type="unfinished"></translation>
</message>
@ -1195,144 +1195,154 @@
<context>
<name>FirewallDialog</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="389"/>
<source>Allow your computer to be discovered by other computers and devices on this network</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="75"/>
<source>Allow other devices on this network to discover this computer?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="392"/>
<source>It is recommended that you enable this feature on your home and work networks rather than public networks.</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="78"/>
<source>It is not recommended to enable this feature on public networks</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="395"/>
<source>Yse</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="81"/>
<source>Not allowed (recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="396"/>
<source>No</source>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="82"/>
<source>Allowed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ipv4Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="68"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<source>Ipv4Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="69"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="70"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<source>Netmask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="74"/>
<source>Default Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="75"/>
<source>Prefs DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="76"/>
<source>Alternative DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="107"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="116"/>
<source>Auto(DHCP)</source>
<translation type="unfinished">Oto(DHCP)</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="108"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="117"/>
<source>Manual</source>
<translation type="unfinished">Elle</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="283"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="295"/>
<source>Invalid address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="292"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="305"/>
<source>Invalid subnet mask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="311"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="312"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="324"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="325"/>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="396"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ipv6Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="149"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<source>Ipv6Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="150"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<source>Subnet prefix Length</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<source>Default Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="155"/>
<source>Prefs DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="156"/>
<source>Alternative DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="188"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="190"/>
<source>Auto(DHCP)</source>
<translation type="unfinished">Oto(DHCP)</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="189"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="191"/>
<source>Manual</source>
<translation type="unfinished">Elle</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="242"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="243"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="244"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="245"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="246"/>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="262"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="264"/>
<source>Invalid address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="271"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="273"/>
<source>Invalid gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="323"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>JoinHiddenWiFiPage</name>
@ -1412,27 +1422,27 @@
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1235"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1236"/>
<source>No ethernet device avaliable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="754"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="755"/>
<source>LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="756"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="757"/>
<source>Activated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="765"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="766"/>
<source>Inactivated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1259"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1260"/>
<source>Wired Device not carried</source>
<translation type="unfinished"></translation>
</message>
@ -1454,7 +1464,6 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="188"/>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>kylin-nm</source>
<translation></translation>
</message>
@ -1489,6 +1498,11 @@
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>Network tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enabled</source>
<translation type="vanished">Aktif</translation>
@ -1598,120 +1612,107 @@
<context>
<name>NetDetail</name>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="68"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="69"/>
<source>Kylin NM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="71"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="72"/>
<source>kylin network desktop message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="282"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<source>Detail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<source>Ipv4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="285"/>
<source>Ipv6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="286"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="287"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="288"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="295"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="289"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="296"/>
<source>Config</source>
<translation type="unfinished">Ayar</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="311"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="312"/>
<source>Confirm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="314"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="315"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="317"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="318"/>
<source>Forget this network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="348"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="349"/>
<source>Add Lan Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="353"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="354"/>
<source>connect hiddin wlan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="509"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="521"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1001"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="511"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="523"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1006"/>
<source>None</source>
<translation type="unfinished">Yok</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="620"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="621"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="622"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="624"/>
<source>Auto</source>
<translation type="unfinished">Oto</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="738"/>
<source>start check ipv4 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="755"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="760"/>
<source>start check ipv6 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="801"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="852"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="940"/>
<source>ipv4 address conflict!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="860"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="948"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="865"/>
<source>ipv6 address conflict!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="997"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<source>this wifi no support enterprise type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<source>this wifi no support None type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1012"/>
<source>this wifi no support WPA2 type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1010"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1015"/>
<source>this wifi no support WPA3 type</source>
<translation type="unfinished"></translation>
</message>
@ -2216,32 +2217,32 @@
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="104"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="105"/>
<source>WLAN</source>
<translation type="unfinished">WLAN</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="106"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="107"/>
<source>Activated WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="116"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="117"/>
<source>Other WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="90"/>
<source>No wireless network card detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="824"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="825"/>
<source>WLAN Connected Successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="820"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="821"/>
<source>WLAN Disconnected Successfully</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View File

@ -41,16 +41,24 @@
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="64"/>
<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>使</translation>
<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>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="68"/>
<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> 使</translation>
<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>
<translation> </translation>
</message>
<message>
<location filename="../src/frontend/netdetails/configpage.cpp" line="73"/>
<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>
<translation></translation>
</message>
@ -456,144 +464,170 @@
<context>
<name>FirewallDialog</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="389"/>
<source>Allow your computer to be discovered by other computers and devices on this network</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="392"/>
<source>It is recommended that you enable this feature on your home and work networks rather than public networks.</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="395"/>
<source>Yse</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="396"/>
<source>No</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="75"/>
<source>Allow other devices on this network to discover this computer?</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="78"/>
<source>It is not recommended to enable this feature on public networks</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="81"/>
<source>Not allowed (recommended)</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/networkmode/firewalldialog.cpp" line="82"/>
<source>Allowed</source>
<translation></translation>
</message>
</context>
<context>
<name>Ipv4Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="68"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<source>Ipv4Config</source>
<translation>Ipv4配置</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="69"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<source>Address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="70"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<source>Netmask</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="71"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="74"/>
<source>Default Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="72"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="75"/>
<source>Prefs DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="73"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="76"/>
<source>Alternative DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="107"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="116"/>
<source>Auto(DHCP)</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="108"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="117"/>
<source>Manual</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="283"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="295"/>
<source>Invalid address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="292"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="305"/>
<source>Invalid subnet mask</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="311"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="312"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="324"/>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="325"/>
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv4page.cpp" line="396"/>
<source>Address conflict</source>
<translation></translation>
</message>
</context>
<context>
<name>Ipv6Page</name>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="149"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<source>Ipv6Config</source>
<translation>Ipv6配置</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="150"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<source>Address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="151"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<source>Subnet prefix Length</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="152"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<source>Default Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="153"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="155"/>
<source>Prefs DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="154"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="156"/>
<source>Alternative DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="188"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="190"/>
<source>Auto(DHCP)</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="189"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="191"/>
<source>Manual</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="242"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="243"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="244"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="245"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="246"/>
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="262"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="264"/>
<source>Invalid address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="271"/>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="273"/>
<source>Invalid gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/ipv6page.cpp" line="323"/>
<source>Address conflict</source>
<translation></translation>
</message>
</context>
<context>
<name>JoinHiddenWiFiPage</name>
@ -666,22 +700,22 @@
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1235"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1236"/>
<source>No ethernet device avaliable</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="754"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="755"/>
<source>LAN</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="756"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="757"/>
<source>Activated LAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="765"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="766"/>
<source>Inactivated LAN</source>
<translation></translation>
</message>
@ -690,7 +724,7 @@
<translation type="vanished">线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1259"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="1260"/>
<source>Wired Device not carried</source>
<translation>线</translation>
</message>
@ -716,7 +750,6 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="188"/>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>kylin-nm</source>
<translation></translation>
</message>
@ -743,36 +776,41 @@
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="309"/>
<source>Network tool</source>
<translation></translation>
</message>
</context>
<context>
<name>NetDetail</name>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="68"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="69"/>
<source>Kylin NM</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="71"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="72"/>
<source>kylin network desktop message</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="282"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<source>Detail</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="283"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<source>Ipv4</source>
<translation>Ipv4</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="284"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="285"/>
<source>Ipv6</source>
<translation>Ipv6</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="286"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="287"/>
<source>Security</source>
<translation></translation>
</message>
@ -781,90 +819,85 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="288"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="295"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="289"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="296"/>
<source>Config</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="311"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="312"/>
<source>Confirm</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="314"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="315"/>
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="317"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="318"/>
<source>Forget this network</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="348"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="349"/>
<source>Add Lan Connect</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="353"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="354"/>
<source>connect hiddin wlan</source>
<translation>WLAN</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="509"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="521"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1001"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="511"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="523"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1006"/>
<source>None</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="620"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="621"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="622"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="624"/>
<source>Auto</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="738"/>
<source>start check ipv4 address conflict</source>
<translation>ipv4地址冲突</translation>
<translation type="vanished">ipv4地址冲突</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="755"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="760"/>
<source>start check ipv6 address conflict</source>
<translation>ipv6地址冲突</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="801"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="852"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="940"/>
<source>ipv4 address conflict!</source>
<translation>ipv4地址冲突</translation>
<translation type="vanished">ipv4地址冲突</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="860"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="948"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="865"/>
<source>ipv6 address conflict!</source>
<translation>ipv6地址冲突</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="997"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<source>this wifi no support enterprise type</source>
<translation>wifi不支持企业网类型</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1002"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<source>this wifi no support None type</source>
<translation>wifi不支持空类型</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1007"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1012"/>
<source>this wifi no support WPA2 type</source>
<translation>wifi不支持WPA2类型</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1010"/>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="1015"/>
<source>this wifi no support WPA3 type</source>
<translation>wifi不支持WPA3类型</translation>
</message>
@ -1265,22 +1298,22 @@
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="104"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="105"/>
<source>WLAN</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="90"/>
<source>No wireless network card detected</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="106"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="107"/>
<source>Activated WLAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="116"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="117"/>
<source>Other WLAN</source>
<translation></translation>
</message>
@ -1289,12 +1322,12 @@
<translation type="vanished">...</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="824"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="825"/>
<source>WLAN Connected Successfully</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="820"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="821"/>
<source>WLAN Disconnected Successfully</source>
<translation>线</translation>
</message>