resolve conflict

This commit is contained in:
jzxc95 2023-06-25 18:08:12 +08:00
commit f018d0e639
14 changed files with 356 additions and 292 deletions

View File

@ -108,12 +108,12 @@
<message>
<location filename="../mobilehotspotwidget.cpp" line="336"/>
<source>use </source>
<translation>使</translation>
<translation>使 </translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="337"/>
<source> share network, will interrupt local wireless connection</source>
<translation>线</translation>
<translation> 线</translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="353"/>
@ -129,7 +129,7 @@
<message>
<location filename="../mobilehotspotwidget.cpp" line="507"/>
<source>Wi-Fi Name</source>
<translation>Wi-Fi名称</translation>
<translation>Wi-Fi </translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="528"/>

View File

@ -43,12 +43,11 @@ void AppListWidget::setAppChecked(bool flag)
/**
* @brief AppListWidget::setAppIcon
* @param icon
* @param icon
*/
void AppListWidget::setAppIcon(const QPixmap &icon)
void AppListWidget::setAppIcon(const QIcon &icon)
{
m_iconLabel->setAlignment(Qt::AlignCenter);
m_iconLabel->setPixmap(icon);
m_iconBtn->setIcon(icon);
}
/**
@ -119,12 +118,19 @@ void AppListWidget::initUI()
mainLayout->setSpacing(8);
m_checkBox = new QCheckBox(this);
m_checkBox->setAttribute(Qt::WA_TransparentForMouseEvents, true); //m_checkBox不响应鼠标事件,将其传递给父窗口
m_iconLabel = new QLabel(this);
m_iconLabel->setFixedSize(24, 24);
m_iconBtn = new QToolButton(this);
m_iconBtn->setToolButtonStyle(Qt::ToolButtonStyle::ToolButtonIconOnly);
m_iconBtn->setAttribute(Qt::WA_TranslucentBackground, true); //透明
m_iconBtn->setAttribute(Qt::WA_TransparentForMouseEvents, true);
m_iconBtn->setAutoRaise(true);
m_iconBtn->setFixedSize(24, 24);
m_iconBtn->setIconSize(QSize(24, 24));
m_nameLabel = new QLabel(this);
mainLayout->addWidget(m_checkBox);
mainLayout->addWidget(m_iconLabel);
mainLayout->addWidget(m_iconBtn);
mainLayout->addWidget(m_nameLabel);
mainLayout->addStretch();
}

View File

@ -28,6 +28,7 @@
#include <QHBoxLayout>
#include <QDBusInterface>
#include <QDBusReply>
#include <QToolButton>
class AppListWidget : public QWidget
{
@ -37,7 +38,7 @@ public:
~AppListWidget();
void setAppChecked(bool flag);
void setAppIcon(const QPixmap &icon);
void setAppIcon(const QIcon &icon);
void setAppName(const QString &text);
void onAppCheckStateChanged();
void AddAppProxyConfig();
@ -51,7 +52,7 @@ private:
void initDbus();
QCheckBox *m_checkBox = nullptr;
QLabel *m_iconLabel = nullptr;
QToolButton *m_iconBtn = nullptr;
QLabel *m_nameLabel = nullptr;
QString m_path = nullptr;
QDBusInterface *m_dbusInterface = nullptr;

View File

@ -127,6 +127,7 @@ QWidget *Proxy::pluginUi() {
} else {
qCritical() << "Xml needed by Proxy is not installed";
}
setUkccProxySettings();
}
return pluginWidget;
}
@ -428,14 +429,21 @@ void Proxy::initUi(QWidget *widget)
AptLayout->addWidget(line_7);
AptLayout->addWidget(mAPTFrame_2);
m_sysSpacerFrame = new QFrame(widget);
m_sysSpacerFrame->setFixedHeight(32);
m_appListSpacerFrame = new QFrame(widget);
m_appListSpacerFrame->setFixedHeight(4);
m_appSpacerFrame = new QFrame(widget);;
m_appSpacerFrame->setFixedHeight(32);;
mverticalLayout->addWidget(mTitleLabel);
mverticalLayout->addWidget(mProxyFrame);
mverticalLayout->addSpacing(32);
mverticalLayout->addWidget(m_sysSpacerFrame);
mverticalLayout->addWidget(m_appProxyLabel);
mverticalLayout->addWidget(m_appProxyFrame);
mverticalLayout->addSpacing(4);
mverticalLayout->addWidget(m_appListSpacerFrame);
mverticalLayout->addWidget(m_appListFrame);
mverticalLayout->addSpacing(32);
mverticalLayout->addWidget(m_appSpacerFrame);
mverticalLayout->addWidget(mAptProxyLabel);
mverticalLayout->addWidget(mAPTFrame);
mverticalLayout->addStretch();
@ -722,10 +730,10 @@ void Proxy::initAppProxyStatus()
m_appEnableBtn->setChecked(state);
onappProxyEnableChanged(state);
appProxyInfoPadding();
// m_cancelBtn->setEnabled(false);
// m_saveBtn->setEnabled(false);
appListPadding();
if (state) {
appProxyInfoPadding();
appListPadding();
}
}
int Proxy::_getCurrentProxyMode(){
@ -970,6 +978,50 @@ QMap<QString, QStringList> Proxy::getAppListProxy()
return appList;
}
void Proxy::setUkccProxySettings()
{
setSystemProxyFrameHidden(false);
setAppProxyFrameHidden(false);
setAPTProxyFrameHidden(false);
QDBusInterface ukccDbusInterface("org.ukui.ukcc.session",
"/",
"org.ukui.ukcc.session.interface",
QDBusConnection::sessionBus());
if(!ukccDbusInterface.isValid()) {
qWarning() << "ukccDbusInterface is invalid";
return;
}
QDBusReply<QMap<QString, QVariant> > reply = ukccDbusInterface.call("getModuleHideStatus");
if (!reply.isValid()) {
qWarning() << "reply of getModuleHideStatus is invalid";
return;
}
QStringList proxySettingList;
if (reply.value().contains("proxySettings")) {
QString proxySettings = reply.value()["proxySettings"].toString();
qDebug() << "proxySettings" << proxySettings;
if (proxySettings.isEmpty()) {
return;
}
proxySettingList = proxySettings.split(",");
}
for (const QString setting : proxySettingList) {
if (setting.contains("SystemProxyFrame") && setting.contains("false")) {
setSystemProxyFrameHidden(true);
} else if (setting.contains("AppProxyFrame") && setting.contains("false")) {
setAppProxyFrameHidden(true);
} else if (setting.contains("APTProxyFrame") && setting.contains("false")) {
setAPTProxyFrameHidden(true);
}
}
}
#if 0
bool Proxy::checkIsChanged(QStringList info)
{
@ -1133,17 +1185,24 @@ void Proxy::setAppProxyFrameUi(QWidget *widget)
m_appLine4 = setLine(m_appProxyFrame);
m_appLine5 = setLine(m_appProxyFrame);
m_appProxyInfoWidget = new QWidget(m_appProxyFrame);
QVBoxLayout *widgetHLayout = new QVBoxLayout(m_appProxyInfoWidget);
widgetHLayout->setContentsMargins(0, 0, 0, 0);
widgetHLayout->setSpacing(0);
widgetHLayout->addWidget(m_appLine1);
widgetHLayout->addWidget(m_proxyTypeFrame);
widgetHLayout->addWidget(m_appLine2);
widgetHLayout->addWidget(m_ipAddressFrame);
widgetHLayout->addWidget(m_appLine3);
widgetHLayout->addWidget(m_portFrame);
widgetHLayout->addWidget(m_appLine4);
widgetHLayout->addWidget(m_userNameFrame);
widgetHLayout->addWidget(m_appLine5);
widgetHLayout->addWidget(m_pwdFrame);
appProxyLayout->addWidget(m_appEnableFrame);
appProxyLayout->addWidget(m_appLine1);
appProxyLayout->addWidget(m_proxyTypeFrame);
appProxyLayout->addWidget(m_appLine2);
appProxyLayout->addWidget(m_ipAddressFrame);
appProxyLayout->addWidget(m_appLine3);
appProxyLayout->addWidget(m_portFrame);
appProxyLayout->addWidget(m_appLine4);
appProxyLayout->addWidget(m_userNameFrame);
appProxyLayout->addWidget(m_appLine5);
appProxyLayout->addWidget(m_pwdFrame);
appProxyLayout->addWidget(m_appProxyInfoWidget);
// appProxyLayout->addWidget(line5);
// appProxyLayout->addWidget(m_appBtnFrame);
@ -1227,7 +1286,7 @@ void Proxy::appListPadding()
AppListWidget *appWidget = new AppListWidget(index, m_appListWidget);
appWidget->setAppName(appInfo.value(0));
appWidget->setAppIcon(QIcon::fromTheme(appInfo.value(1)).pixmap(24, 24));
appWidget->setAppIcon(QIcon::fromTheme(appInfo.value(1)));
appWidget->setAppChecked(flag);
QListWidgetItem *appListWidgetItem = new QListWidgetItem(m_appListWidget);
@ -1251,6 +1310,28 @@ bool Proxy::getipEditState(QString text)
return match;
}
void Proxy::setSystemProxyFrameHidden(bool state)
{
mTitleLabel->setHidden(state);
mProxyFrame->setHidden(state);
m_sysSpacerFrame->setHidden(state);
}
void Proxy::setAppProxyFrameHidden(bool state)
{
m_appProxyLabel->setHidden(state);
m_appProxyFrame->setHidden(state);
m_appListFrame->setHidden(state);
m_appListSpacerFrame->setHidden(state);
m_appSpacerFrame->setHidden(state);
}
void Proxy::setAPTProxyFrameHidden(bool state)
{
mAptProxyLabel->setHidden(state);
mAPTFrame->setHidden(state);
}
void Proxy::onipEditStateChanged()
{
if (!getipEditState(m_ipAddressLineEdit->text())) {
@ -1304,17 +1385,13 @@ void Proxy::onPaletteChanged()
void Proxy::onappProxyEnableChanged(bool enable)
{
m_proxyTypeFrame->setVisible(enable);
m_ipAddressFrame->setVisible(enable);
m_portFrame->setVisible(enable);
m_userNameFrame->setVisible(enable);
m_pwdFrame->setVisible(enable);
m_appListFrame->setVisible(enable);
m_appLine1->setVisible(enable);
m_appLine2->setVisible(enable);
m_appLine3->setVisible(enable);
m_appLine4->setVisible(enable);
m_appLine5->setVisible(enable);
if (enable) {
m_appProxyInfoWidget->show();
m_appListFrame->show();
} else {
m_appProxyInfoWidget->hide();
m_appListFrame->hide();
}
}
#if 0

View File

@ -136,6 +136,7 @@ public:
void setAppProxyConf(QStringList list); //设置应用代理配置信息--调用Dbus
static QMap<QString, QStringList> getAppListProxy();
// bool checkIsChanged(QStringList info);
void setUkccProxySettings(); // 设置控制面板代理模块显示/隐藏
private:
void setAppProxyFrameUi(QWidget *widget);
@ -143,6 +144,13 @@ private:
void appProxyInfoPadding();
void appListPadding();
bool getipEditState(QString text);
void setSystemProxyFrameHidden(bool state);
void setAppProxyFrameHidden(bool state);
void setAPTProxyFrameHidden(bool state);
QFrame *m_sysSpacerFrame;
QFrame *m_appListSpacerFrame;
QFrame *m_appSpacerFrame;
QString pluginName;
int pluginType;
@ -250,6 +258,7 @@ private:
// QPushButton *m_cancelBtn;
// QPushButton *m_saveBtn;
QListWidget *m_appListWidget = nullptr;
QWidget *m_appProxyInfoWidget;
QTextEdit *mIgnoreLineEdit;

View File

@ -6,7 +6,7 @@
<message>
<location filename="../aptproxydialog.cpp" line="24"/>
<source>Set Apt Proxy</source>
<translation>APT代理</translation>
<translation> APT </translation>
</message>
<message>
<location filename="../aptproxydialog.cpp" line="41"/>
@ -69,31 +69,31 @@
<message>
<location filename="../proxy.cpp" line="452"/>
<source>Auto url</source>
<translation>URL</translation>
<translation> URL</translation>
<extra-contents_path>/Proxy/Auto url</extra-contents_path>
</message>
<message>
<location filename="../proxy.cpp" line="454"/>
<source>Http Proxy</source>
<translation>HTTP代理</translation>
<translation>HTTP </translation>
<extra-contents_path>/Proxy/Http Proxy</extra-contents_path>
</message>
<message>
<location filename="../proxy.cpp" line="456"/>
<source>Https Proxy</source>
<translation>HTTPS代理</translation>
<translation>HTTPS </translation>
<extra-contents_path>/Proxy/Https Proxy</extra-contents_path>
</message>
<message>
<location filename="../proxy.cpp" line="458"/>
<source>Ftp Proxy</source>
<translation>FTP代理</translation>
<translation>FTP </translation>
<extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path>
</message>
<message>
<location filename="../proxy.cpp" line="460"/>
<source>Socks Proxy</source>
<translation>SOCKS代理</translation>
<translation>SOCKS </translation>
<extra-contents_path>/Proxy/Socks Proxy</extra-contents_path>
</message>
<message>
@ -119,7 +119,7 @@
<message>
<location filename="../proxy.cpp" line="471"/>
<source>Apt Proxy</source>
<translation>APT代理</translation>
<translation>APT </translation>
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path>
</message>
<message>
@ -146,7 +146,7 @@
<message>
<location filename="../proxy.cpp" line="573"/>
<source>The apt proxy has been turned off and needs to be restarted to take effect</source>
<translation>APT代理已关闭</translation>
<translation>APT </translation>
</message>
<message>
<location filename="../proxy.cpp" line="574"/>
@ -163,7 +163,7 @@
<message>
<location filename="../proxy.cpp" line="813"/>
<source>The system needs to be restarted to set the Apt proxy, whether to reboot</source>
<translation>APT代理需要重启系统后生效</translation>
<translation> APT </translation>
</message>
<message>
<location filename="../proxy.cpp" line="1017"/>
@ -173,7 +173,7 @@
<message>
<location filename="../proxy.cpp" line="1034"/>
<source>IP address</source>
<translation>IP地址</translation>
<translation>IP </translation>
</message>
<message>
<location filename="../proxy.cpp" line="1040"/>
@ -184,7 +184,7 @@
<message>
<location filename="../proxy.cpp" line="1061"/>
<source>Invalid IP Address</source>
<translation>IP地址</translation>
<translation> IP </translation>
</message>
<message>
<location filename="../proxy.cpp" line="1082"/>

View File

@ -19,7 +19,7 @@
<message>
<location filename="../itemframe.cpp" line="38"/>
<source>Add VPN</source>
<translation>VPN</translation>
<translation> VPN</translation>
</message>
</context>
<context>
@ -34,11 +34,6 @@
<source>import</source>
<translation></translation>
</message>
<message>
<location filename="../vpn.cpp" line="68"/>
<source>VPN</source>
<translation></translation>
</message>
<message>
<location filename="../vpn.cpp" line="151"/>
<source>Show on Taskbar</source>

View File

@ -11,12 +11,12 @@
<message>
<location filename="../frontend/single-pages/singlepage.cpp" line="121"/>
<source>Kylin VPN</source>
<translation>VPN工具</translation>
<translation>VPN </translation>
</message>
<message>
<location filename="../frontend/single-pages/singlepage.cpp" line="124"/>
<source>kylin vpn applet desktop message</source>
<translation>vpn配置桌面提</translation>
<translation>VPN </translation>
</message>
</context>
<context>
@ -24,7 +24,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="791"/>
<source>MPPE encryption algorithm:</source>
<translation>MPPE加密算法</translation>
<translation>MPPE </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="792"/>
@ -34,7 +34,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="793"/>
<source>Send PPP echo packets</source>
<translation>PPP回显包</translation>
<translation> PPP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="794"/>
@ -44,27 +44,27 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="795"/>
<source>PAP authentication</source>
<translation>PAP认证</translation>
<translation>PAP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="796"/>
<source>CHAP authentication</source>
<translation>CHAP认证</translation>
<translation>CHAP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="797"/>
<source>MSCHAP authentication</source>
<translation>MSCHAP认证</translation>
<translation>MSCHAP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="798"/>
<source>MSCHAP2 authentication</source>
<translation>MSCHAP2认证</translation>
<translation>MSCHAP2 </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="799"/>
<source>EAP authentication</source>
<translation>EAP认证</translation>
<translation>EAP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="800"/>
@ -74,17 +74,17 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="801"/>
<source>Allow BSD data compression</source>
<translation>BSD压缩</translation>
<translation> BSD </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="802"/>
<source>Allow Default data compression</source>
<translation>Default压缩</translation>
<translation> Default </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="803"/>
<source>Allow TCP header compression</source>
<translation>TCP头压缩</translation>
<translation> TCP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="804"/>
@ -124,7 +124,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1012"/>
<source>Use a TCP connection</source>
<translation>使TCP连接</translation>
<translation>使 TCP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1013"/>
@ -139,7 +139,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1015"/>
<source>Limit TCP Maximum Segment Size(MSS)</source>
<translation>TCP最大段尺寸MSS</translation>
<translation> TCP MSS</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1016"/>
@ -149,17 +149,17 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1017"/>
<source>IPv6 tun link</source>
<translation>IPv6 tun连接</translation>
<translation>IPv6 tun </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1018"/>
<source>Specify ping interval</source>
<translation>Ping周期</translation>
<translation> Ping </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1019"/>
<source>Specify exit or restart ping</source>
<translation>退Ping</translation>
<translation>退 Ping</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1020"/>
@ -194,7 +194,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1030"/>
<source>Use custom UDP fragment size</source>
<translation>使UDP分片大小</translation>
<translation>使 UDP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1032"/>
@ -244,7 +244,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1044"/>
<source>TLS settings</source>
<translation>TLS设置</translation>
<translation>TLS </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1045"/>
@ -259,7 +259,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1049"/>
<source>Verify peer (server) certificate nsCertType specification</source>
<translation>nsCertType指定</translation>
<translation> nsCertType </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1050"/>
@ -284,7 +284,7 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1054"/>
<source>HMAC Authentication</source>
<translation>HMAC认证</translation>
<translation>HMAC </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1064"/>
@ -383,17 +383,17 @@
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1179"/>
<source>Request an inner IP address</source>
<translation>IP地址</translation>
<translation> IP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1180"/>
<source>Enforce UDP encapsulation</source>
<translation>UDP封装</translation>
<translation> UDP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1181"/>
<source>Use IP compression</source>
<translation>使IP压缩</translation>
<translation>使 IP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnadvancedpage.cpp" line="1182"/>
@ -421,17 +421,17 @@
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="315"/>
<source>Local IP</source>
<translation>IP地址</translation>
<translation> IP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="316"/>
<source>Remote IP</source>
<translation>IP地址</translation>
<translation> IP </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="317"/>
<source>PIN Code</source>
<translation>PIN</translation>
<translation>PIN </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="318"/>
@ -443,7 +443,7 @@
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="319"/>
<source>NT Domain</source>
<translation>NT</translation>
<translation>NT </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="321"/>
@ -458,7 +458,7 @@
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="323"/>
<source>CA Certificate</source>
<translation>CA证书</translation>
<translation>CA </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="324"/>
@ -564,7 +564,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="808"/>
<source>Certificate/ssh-agent</source>
<translation>/ssh-agent</translation>
<translation>/ ssh-agent</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="809"/>
@ -580,12 +580,12 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="866"/>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="905"/>
<source>Key Files (*.key *.pem *.der *.p12 *.pfx)</source>
<translation>(*.key *.pem *.der *.p12 *.pfx)</translation>
<translation> (*.key *.pem *.der *.p12 *.pfx)</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="877"/>
<source>Choose a CA certificate</source>
<translation>CA证书</translation>
<translation> CA </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnconfigpage.cpp" line="879"/>
@ -609,7 +609,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="152"/>
<source>IPv4 Config</source>
<translation>IPv4配置</translation>
<translation>IPv4 </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="153"/>
@ -629,7 +629,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="156"/>
<source>DNS Server</source>
<translation>DNS服务器</translation>
<translation>DNS </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="157"/>
@ -639,12 +639,12 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="158"/>
<source>DHCP Client ID</source>
<translation>DHCP客户端ID</translation>
<translation>DHCP ID</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="160"/>
<source>Auto(DHCP)</source>
<translation>(DHCP)</translation>
<translation> (DHCP)</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv4page.cpp" line="161"/>
@ -657,7 +657,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnipv6page.cpp" line="141"/>
<source>IPv6 Config</source>
<translation>IPv6配置</translation>
<translation>IPv6 </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv6page.cpp" line="142"/>
@ -677,7 +677,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnipv6page.cpp" line="145"/>
<source>DNS Server</source>
<translation>DNS服务器</translation>
<translation>DNS </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv6page.cpp" line="146"/>
@ -687,7 +687,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnipv6page.cpp" line="148"/>
<source>Auto(DHCP)</source>
<translation>(DHCP)</translation>
<translation> (DHCP)</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnipv6page.cpp" line="149"/>
@ -725,7 +725,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/single-pages/vpnpage.cpp" line="270"/>
<source>VPN Settings</source>
<translation>VPN设置</translation>
<translation>VPN </translation>
</message>
</context>
<context>
@ -733,17 +733,17 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpndetails/vpnaddpage.cpp" line="15"/>
<source>create VPN</source>
<translation>VPN</translation>
<translation> VPN</translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnaddpage.cpp" line="47"/>
<source>VPN Type</source>
<translation>VPN类型</translation>
<translation>VPN </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnaddpage.cpp" line="75"/>
<source>VPN Name</source>
<translation>VPN名称</translation>
<translation>VPN </translation>
</message>
<message>
<location filename="../frontend/vpndetails/vpnaddpage.cpp" line="81"/>
@ -829,7 +829,7 @@ If key direction is used, it must be opposite to the VPN side used. If &apos;1&a
<message>
<location filename="../frontend/vpnobject.cpp" line="31"/>
<source>vpn tool</source>
<translation>VPN工具</translation>
<translation>VPN </translation>
</message>
</context>
</TS>

View File

@ -1318,7 +1318,7 @@ void LanPage::getWiredDeviceConnectState(QMap<QString, QString> &map)
if (state < NetworkManager::Connectivity::Full) {
m_activeResourse->getActiveConnectionList(devname, NetworkManager::ConnectionSettings::Wired, activedList);
if (!activedList.isEmpty()) {
map.insert(devname, QString(tr("Connected: ")) + activedList.at(0)->m_connectName + QString(tr("(Limited)")));
map.insert(devname, QString(tr("Connected: ")) + activedList.at(0)->m_connectName + " " + QString(tr("(Limited)")));
} else {
map.insert(devname, tr("Not Connected"));
}

View File

@ -1677,7 +1677,7 @@ void WlanPage::getWirelssDeviceConnectState(QMap<QString, QString> &map)
m_netDeviceResource->getDeviceConnectivity(devname, state);
if (state < NetworkManager::Connectivity::Full) {
if (m_wirelessNetResource->getActiveWirelessNetItem(devname, wirelessNetItem)) {
map.insert(devname, QString(tr("Connected: ")) + wirelessNetItem.m_connName + QString(tr("(Limited)")));
map.insert(devname, QString(tr("Connected: ")) + wirelessNetItem.m_connName + " " + QString(tr("(Limited)")));
} else {
map.insert(devname, tr("Not Connected"));
}

View File

@ -303,23 +303,23 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="268"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="272"/>
<source>Invalid address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="277"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="281"/>
<source>Invalid subnet mask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="303"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="304"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="307"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="308"/>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="374"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="378"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
</message>
@ -587,102 +587,102 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="366"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="359"/>
<source>Detail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="370"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="363"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="365"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="372"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="379"/>
<source>Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="391"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="384"/>
<source>Confirm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="393"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="386"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="451"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="444"/>
<source>Forget this network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="367"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="360"/>
<source>IPv4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="368"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="361"/>
<source>IPv6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="432"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="425"/>
<source>Add LAN Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="437"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="430"/>
<source>Connect Hidden WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="453"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="446"/>
<source>Delete this network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="618"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="630"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1173"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="611"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1166"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="742"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="743"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="744"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="735"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="736"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="737"/>
<source>Auto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="885"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="878"/>
<source>start check ipv4 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="902"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="895"/>
<source>start check ipv6 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1169"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1162"/>
<source>this wifi no support enterprise type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1174"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1167"/>
<source>this wifi no support None type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1179"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1172"/>
<source>this wifi no support WPA2 type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1182"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1175"/>
<source>this wifi no support WPA3 type</source>
<translation type="unfinished"></translation>
</message>
@ -800,8 +800,8 @@
<location filename="../frontend/netdetails/securitypage.cpp" line="1129"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1160"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1182"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1205"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1260"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1211"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1266"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
@ -891,24 +891,22 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1150"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1173"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1195"/>
<source>Choose a CA certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1151"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1174"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1196"/>
<source>CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1250"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1256"/>
<source>Choose a PAC file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1251"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1257"/>
<source>PAC Files (*.pac)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -619,23 +619,23 @@
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="268"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="272"/>
<source>Invalid address</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="277"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="281"/>
<source>Invalid subnet mask</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="303"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="304"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="307"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="308"/>
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="374"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="378"/>
<source>Address conflict</source>
<translation></translation>
</message>
@ -930,22 +930,22 @@
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="366"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="359"/>
<source>Detail</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="367"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="360"/>
<source>IPv4</source>
<translation>IPv4</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="368"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="361"/>
<source>IPv6</source>
<translation>IPv6</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="370"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="363"/>
<source>Security</source>
<translation></translation>
</message>
@ -954,62 +954,62 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="365"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="372"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="379"/>
<source>Config</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="391"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="384"/>
<source>Confirm</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="393"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="386"/>
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="451"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="444"/>
<source>Forget this network</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="453"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="446"/>
<source>Delete this network</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="432"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="425"/>
<source>Add LAN Connect</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="437"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="430"/>
<source>Connect Hidden WLAN</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="618"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="630"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1173"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="611"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1166"/>
<source>None</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="742"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="743"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="744"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="735"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="736"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="737"/>
<source>Auto</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="885"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="878"/>
<source>start check ipv4 address conflict</source>
<translation>ipv4ས</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="902"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="895"/>
<source>start check ipv6 address conflict</source>
<translation>ipv6གནས</translation>
</message>
@ -1022,22 +1022,22 @@
<translation type="vanished">ipv6ཐག!</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1169"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1162"/>
<source>this wifi no support enterprise type</source>
<translation>wifiལ</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1174"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1167"/>
<source>this wifi no support None type</source>
<translation>wifiལ</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1179"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1172"/>
<source>this wifi no support WPA2 type</source>
<translation>wifiལWPA2རིགས</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1182"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1175"/>
<source>this wifi no support WPA3 type</source>
<translation>wifiལWPA3རིགས</translation>
</message>
@ -1242,8 +1242,8 @@
<location filename="../frontend/netdetails/securitypage.cpp" line="1129"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1160"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1182"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1205"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1260"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1211"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1266"/>
<source>None</source>
<translation></translation>
</message>
@ -1303,14 +1303,12 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1150"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1173"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1195"/>
<source>Choose a CA certificate</source>
<translation>CAཡི</translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1151"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1174"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1196"/>
<source>CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)</source>
<translation>CA (*.pem *.der *.p12 *.crt *.cer *.pfx)</translation>
</message>
@ -1351,13 +1349,13 @@
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1250"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1256"/>
<source>Choose a PAC file</source>
<translatorcomment>PAC文件</translatorcomment>
<translation>PACཡིག</translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1251"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1257"/>
<source>PAC Files (*.pac)</source>
<translatorcomment>PAC文件(*.pac)</translatorcomment>
<translation>PACཡིག(*.pac)</translation>

View File

@ -1322,23 +1322,23 @@
<translation type="unfinished">Elle</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="268"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="272"/>
<source>Invalid address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="277"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="281"/>
<source>Invalid subnet mask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="303"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="304"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="307"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="308"/>
<source>Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="374"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="378"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
</message>
@ -1729,102 +1729,102 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="366"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="359"/>
<source>Detail</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="370"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="363"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="365"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="372"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="379"/>
<source>Config</source>
<translation type="unfinished">Ayar</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="391"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="384"/>
<source>Confirm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="393"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="386"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="451"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="444"/>
<source>Forget this network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="367"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="360"/>
<source>IPv4</source>
<translation type="unfinished">IPv6 adresi: {4?}</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="368"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="361"/>
<source>IPv6</source>
<translation type="unfinished">IPv6 adresi: {6?}</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="432"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="425"/>
<source>Add LAN Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="437"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="430"/>
<source>Connect Hidden WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="453"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="446"/>
<source>Delete this network</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="618"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="630"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1173"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="611"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1166"/>
<source>None</source>
<translation type="unfinished">Yok</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="742"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="743"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="744"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="735"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="736"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="737"/>
<source>Auto</source>
<translation type="unfinished">Oto</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="885"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="878"/>
<source>start check ipv4 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="902"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="895"/>
<source>start check ipv6 address conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1169"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1162"/>
<source>this wifi no support enterprise type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1174"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1167"/>
<source>this wifi no support None type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1179"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1172"/>
<source>this wifi no support WPA2 type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1182"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1175"/>
<source>this wifi no support WPA3 type</source>
<translation type="unfinished"></translation>
</message>
@ -2140,8 +2140,8 @@
<location filename="../frontend/netdetails/securitypage.cpp" line="1129"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1160"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1182"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1205"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1260"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1211"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1266"/>
<source>None</source>
<translation type="unfinished">Yok</translation>
</message>
@ -2231,24 +2231,22 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1150"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1173"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1195"/>
<source>Choose a CA certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1151"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1174"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1196"/>
<source>CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1250"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1256"/>
<source>Choose a PAC file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1251"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1257"/>
<source>PAC Files (*.pac)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -80,12 +80,12 @@
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="88"/>
<source>IPv4Config</source>
<translation>IPv4配置</translation>
<translation>IPv4 </translation>
</message>
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="89"/>
<source>Address</source>
<translation>IPv4地址</translation>
<translation>IPv4 </translation>
</message>
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="90"/>
@ -99,16 +99,16 @@
</message>
<message>
<source>Prefs DNS</source>
<translation type="vanished">DNS</translation>
<translation type="vanished"> DNS</translation>
</message>
<message>
<source>Alternative DNS</source>
<translation type="vanished">DNS</translation>
<translation type="vanished"> DNS</translation>
</message>
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="107"/>
<source>Auto(DHCP)</source>
<translation>(DHCP)</translation>
<translation> (DHCP)</translation>
</message>
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="108"/>
@ -158,7 +158,7 @@
<message>
<location filename="../frontend/netdetails/detailpage.cpp" line="217"/>
<source>Please input SSID:</source>
<translation>SSID:</translation>
<translation> SSID:</translation>
</message>
<message>
<location filename="../frontend/netdetails/detailpage.cpp" line="227"/>
@ -194,19 +194,19 @@
<location filename="../frontend/netdetails/detailpage.cpp" line="259"/>
<location filename="../frontend/netdetails/detailpage.cpp" line="330"/>
<source>IPv6:</source>
<translation>IPv6地址</translation>
<translation> IPv6 </translation>
</message>
<message>
<location filename="../frontend/netdetails/detailpage.cpp" line="247"/>
<location filename="../frontend/netdetails/detailpage.cpp" line="328"/>
<source>IPv4:</source>
<translation>IPv4地址</translation>
<translation>IPv4 </translation>
</message>
<message>
<location filename="../frontend/netdetails/detailpage.cpp" line="253"/>
<location filename="../frontend/netdetails/detailpage.cpp" line="329"/>
<source>IPv4 DNS:</source>
<translation>IPv4 DNS服务器</translation>
<translation>IPv4 DNS </translation>
</message>
<message>
<location filename="../frontend/netdetails/detailpage.cpp" line="263"/>
@ -450,7 +450,7 @@
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="34"/>
<source>DNS Server Advanced Settings</source>
<translation>DNS </translation>
<translation>DNS </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="37"/>
@ -480,7 +480,7 @@
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="48"/>
<source>concurrency</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="53"/>
@ -492,14 +492,6 @@
<source> times</source>
<translation> </translation>
</message>
<message>
<source>s</source>
<translation type="vanished"></translation>
</message>
<message>
<source>times</source>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="72"/>
<source>Cancel</source>
@ -524,12 +516,12 @@
<message>
<location filename="../frontend/enterprise-wlan/enterprisewlandialog.cpp" line="106"/>
<source>Wi-Fi network requires authentication</source>
<translation>Wi-Fi网络要求认证</translation>
<translation>Wi-Fi </translation>
</message>
<message>
<location filename="../frontend/enterprise-wlan/enterprisewlandialog.cpp" line="111"/>
<source>Access to Wi-Fi network &quot;</source>
<translation>访Wi-Fi网络</translation>
<translation>访 Wi-Fi </translation>
</message>
<message>
<location filename="../frontend/enterprise-wlan/enterprisewlandialog.cpp" line="113"/>
@ -591,7 +583,7 @@
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="66"/>
<source>IPv4Config</source>
<translation>IPv4配置</translation>
<translation>IPv4 </translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="67"/>
@ -610,11 +602,11 @@
</message>
<message>
<source>Prefs DNS</source>
<translation type="vanished">DNS</translation>
<translation type="vanished"> DNS</translation>
</message>
<message>
<source>Alternative DNS</source>
<translation type="vanished">DNS</translation>
<translation type="vanished"> DNS</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="115"/>
@ -627,23 +619,23 @@
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="268"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="272"/>
<source>Invalid address</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="277"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="281"/>
<source>Invalid subnet mask</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="303"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="304"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="307"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="308"/>
<source>Required</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="374"/>
<location filename="../frontend/netdetails/ipv4page.cpp" line="378"/>
<source>Address conflict</source>
<translation></translation>
</message>
@ -653,7 +645,7 @@
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="134"/>
<source>IPv6Config</source>
<translation>IPv6配置</translation>
<translation>IPv6 </translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="135"/>
@ -672,11 +664,11 @@
</message>
<message>
<source>Prefs DNS</source>
<translation type="vanished">DNS</translation>
<translation type="vanished"> DNS</translation>
</message>
<message>
<source>Alternative DNS</source>
<translation type="vanished">DNS</translation>
<translation type="vanished"> DNS</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="178"/>
@ -720,7 +712,7 @@
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="142"/>
<source>Network name(SSID)</source>
<translation>(SSID)</translation>
<translation> (SSID)</translation>
</message>
<message>
<source>Remember the Network</source>
@ -749,7 +741,7 @@
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join Wi-Fi</source>
<translation>Wi-Fi</translation>
<translation> Wi-Fi</translation>
</message>
</context>
<context>
@ -905,23 +897,15 @@
</context>
<context>
<name>MultipleDnsWidget</name>
<message>
<source>DNS server:</source>
<translation type="vanished">DNS服务器</translation>
</message>
<message>
<source>DNS server(Drag to sort):</source>
<translation type="vanished">DNS </translation>
</message>
<message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="57"/>
<source>DNS server(Drag to sort)</source>
<translation>DNS </translation>
<translation>DNS </translation>
</message>
<message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="64"/>
<source>Click &quot;+&quot; to configure DNS</source>
<translation>+ DNS</translation>
<translation> + DNS</translation>
</message>
<message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="101"/>
@ -942,22 +926,22 @@
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="366"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="359"/>
<source>Detail</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="367"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="360"/>
<source>IPv4</source>
<translation>IPv4</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="368"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="361"/>
<source>IPv6</source>
<translation>IPv6</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="370"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="363"/>
<source>Security</source>
<translation></translation>
</message>
@ -966,64 +950,64 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="365"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="372"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="379"/>
<source>Config</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="391"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="384"/>
<source>Confirm</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="393"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="386"/>
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="451"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="444"/>
<source>Forget this network</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="453"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="446"/>
<source>Delete this network</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="432"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="425"/>
<source>Add LAN Connect</source>
<translation>线</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="437"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="430"/>
<source>Connect Hidden WLAN</source>
<translation>WLAN</translation>
<translation> WLAN</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="618"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="630"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1173"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="611"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="623"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1166"/>
<source>None</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="742"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="743"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="744"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="735"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="736"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="737"/>
<source>Auto</source>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="885"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="878"/>
<source>start check ipv4 address conflict</source>
<translation>ipv4地址冲突</translation>
<translation> ipv4 </translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="902"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="895"/>
<source>start check ipv6 address conflict</source>
<translation>ipv6地址冲突</translation>
<translation> ipv6 </translation>
</message>
<message>
<source>ipv4 address conflict!</source>
@ -1034,24 +1018,24 @@
<translation type="vanished">ipv6地址冲突</translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1169"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1162"/>
<source>this wifi no support enterprise type</source>
<translation>wifi不支持企业网类型</translation>
<translation> wifi </translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1174"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1167"/>
<source>this wifi no support None type</source>
<translation>wifi不支持空类型</translation>
<translation> wifi </translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1179"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1172"/>
<source>this wifi no support WPA2 type</source>
<translation>wifi不支持WPA2类型</translation>
<translation> wifi WPA2 </translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="1182"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="1175"/>
<source>this wifi no support WPA3 type</source>
<translation>wifi不支持WPA3类型</translation>
<translation> wifi WPA3 </translation>
</message>
<message>
<source>SSID:</source>
@ -1178,7 +1162,7 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="237"/>
<source>EAP type</source>
<translation>EAP方法</translation>
<translation>EAP </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="239"/>
@ -1198,7 +1182,7 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="242"/>
<source>no need for CA certificate</source>
<translation>CA证书</translation>
<translation> CA </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="243"/>
@ -1254,8 +1238,8 @@
<location filename="../frontend/netdetails/securitypage.cpp" line="1129"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1160"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1182"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1205"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1260"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1211"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1266"/>
<source>None</source>
<translation></translation>
</message>
@ -1315,14 +1299,12 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1150"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1173"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1195"/>
<source>Choose a CA certificate</source>
<translation>CA证书</translation>
<translation> CA </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1151"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1174"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1196"/>
<source>CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)</source>
<translation>CA (*.pem *.der *.p12 *.crt *.cer *.pfx)</translation>
</message>
@ -1334,7 +1316,7 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="291"/>
<source>Allow automatic PAC provisioning</source>
<translation>PAC配置</translation>
<translation> PAC </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="292"/>
@ -1357,14 +1339,14 @@
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1250"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1256"/>
<source>Choose a PAC file</source>
<translation>PAC文件</translation>
<translation> PAC </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1251"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="1257"/>
<source>PAC Files (*.pac)</source>
<translation>PAC文件(*.pac)</translation>
<translation>PAC (*.pac)</translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.h" line="126"/>