From 47b8f623e0199ad85ff6f37df341d1991021f2aa Mon Sep 17 00:00:00 2001
From: chenlelin <chenlelin@kylinos.cn>
Date: Fri, 26 Mar 2021 15:18:45 +0800
Subject: [PATCH] Fix bug can not translate some sentences

---
 src/mainwindow.cpp             |  12 ++++--------
 translations/kylin-nm_zh_CN.qm | Bin 22741 -> 22887 bytes
 translations/kylin-nm_zh_CN.ts |  23 +++++++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ac0ce45a..9d1156df 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1706,12 +1706,6 @@ void MainWindow::getWifiListDone(QStringList slist)
         }
     }
 
-    qDebug()<<"------------";
-    foreach (QString str, slist) {
-        qDebug()<<str;
-    }
-    qDebug()<<"------------";
-
     if (current_wifi_list_state == RECONNECT_WIFI) {
         QStringList targetWifiList = connectableWifiPriorityList(slist);
         if (!targetWifiList.isEmpty()) {
@@ -3067,8 +3061,10 @@ void MainWindow::on_btnHotspotState()
 //执行wifi的重新连接
 void MainWindow::toReconnectWifi()
 {
-    current_wifi_list_state = RECONNECT_WIFI;
-    this->ksnm->execGetWifiList(this->wcardname);
+    if (isHuaWeiPC) {
+        current_wifi_list_state = RECONNECT_WIFI;
+        this->ksnm->execGetWifiList(this->wcardname);
+    }
 }
 
 //处理外界对网络的连接与断开
diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm
index 46253d4967a24e8ab4ecdf08eb70cc0eb9610c6d..d15b9448bfb7e633dca6791423afd9f35f23acb6 100644
GIT binary patch
delta 2596
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
M>o`k`)1WK<9~;ob82|tP

delta 2520
zcmXZdd2~#76bJA-GjArDH(MfmGC^XpO!j3)CK<ACBTJ<Rb<k6kv@|8Q7NJjx9;v;K
zG-^3P8XCF~qE)+4BWN{|Q#sayww6+%R727mUw?gmZ+`RMyTALpzx)2!ExWKww#rjF
zLZlo`B$%N+6Bg)+N}NQAzmrhCok)G2g!bh`c>>IDBW1posAv!=N8}K>xI(QzbYBa7
zN5a53XmY@a-Ee&D6bvk{CTyL!w)?=mF|cSdDVKc70W2hC%?S>;kd#+Bz-%Ll4^2da
zCR3c(e4?CmIHZIel^ckLRIGmCBgK$&h!>IG0X?dq-(Rp_APgN0qh`Z6C$wIJ$%U|Z
zG<6)lNTl5d-Je3=E*Q89nsz`b;tD+}8b&m@Q5G86Mif~u%e<1v(dWs=l<eU&cFLw+
zN+NPyE?ZvBfjW9*jW<3b%50GBdyvhmohCbzy^e^=WnFQ6e`<|9`bZtmm&p@LS@jrs
zS*?ThgPu;<f0Vr3{aupCx?Ns=t&1PjEWdH@A5P0x3iZB;L>Y++bH@x0ELLGLav<rX
z7&w(*tgeQJD(Iz!0a393Mi@2^CL}5*rd}ZOw!@%S82+{5^GkCiqJkbpQ-GEWMS}Xx
z(BnGv&w>4B!qBxa>Sq|=7Y?+*<XUKdW${iSPMScJl`o8p8O3#SS(tvDi#W|D)HtLA
zL^3ZPu*#`WOoN6V=q<v4S{SqihR=u5cVNP1n3M-orofz6&&_`g*M(_9Q&KmPPl?bZ
z^$vn>;|KF$p=lZ)H{lr^*diPfIZ{;{)Ckb68Txob<9HbS4Ky!?G4(KU6tw*)IEV7{
zGL%A>M+n!_8KvYM*_)Cm<x3r<O55mpMDi|WLCA-kGErGr&0CYcNjaj0YeJi+JXE)p
zi|k+J{ldpQ->y=fJV<1jt_o}B+9^Dz8oOc*7waumMFZE0rUv>{!U3~XFBj;V4GrlM
z2A&I`|4rE69fnz8bQz4luR0&JmrqBx>UIKW&Qa|m>RO3(a@Z#m26jNx6BrrpV)p0L
z;;VuKp27%eoJ&?JcRKlLm+vy4apZESe+oU5p#OT<&j~~C!e|qWp9Tkh0#nS;{@A5e
zRY{bx(Y4{mP0rv#=za`Jz9%sV90N@sz}Om?902X_!=lez8z1m_wlt`%5&XdH{c5Xa
z0T=Ngwbk0|6!j42V$R5H*ynrLw-|<$!PxGXN@TgJUeF!GsadS9HU3THH=ljT?o~I-
z=koD9sCH)Y-s&=7pO2wmF6`?IL##0NG%PlYzEySHh)m+RE(=j^JIt>aCl+wvs^VVx
z{EOxI!7UDYFN6WVz+itE{s_kS!i00s77KHS!u$$Y_?|dxO){VJE#iXC9sI&MP<(am
zHlD8~p77p-38M@K7eccM#^k|-=g{^h%&ibB+xdQ8!ihb+CFY0X*`w)POA7JcDuGXl
zQ{(>p3(nviO`_#fqWnOO?KJ;e@rLH@W8C7s@-*|M;0``sEt+N5$MQ^yX64RMZbWt{
z3eeCD14?1gJ1{&8M(>6RlVOsZW^3=4FtSv$b1nCiqGOs<Ma}#rv};;6I*H=<X+3Z9
z`{XONQdZTU{0F(VIFoyPs!Cfwd=^Jm0sH?3!<w|;zRtCw2-fb|z>UM@98B)iUdZPM
zM%i?M^)_C}a9wD<Cog21E;Z*Cr+%hxopBi7*Q#6p-*D~+m!bPe=;M?yFg}I@_QQw}
z7;AwRH<)rscj6SUL{X({Te^%J&=TE?ib@Xn01WbjVNdj4wLfsto`oJd*mnyIISS*X
zp%_@>^l7{P<Go7OJA?-Ahz<I=c7NWp=lZ#$Sx3BnQ(14ytoq|i=WwU1(f?$q;uWPq
zw;pKR00$Uh%oUipT7PTaT5i3I^xfC_G-R|Jv^RMnZ>5$Pq7oi)b?RW!T{w6K%rzMD
zc2D4%SO=44!a)aM&U(Y7Z6;3juZD{eE4UvlGThbG@!mh0L{!|>ct`z0Xq;r|cKi==
Cg{qPO

diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts
index 779d4c02..55b076a9 100644
--- a/translations/kylin-nm_zh_CN.ts
+++ b/translations/kylin-nm_zh_CN.ts
@@ -121,6 +121,16 @@
         <source>Add Wired Network</source>
         <translation type="unfinished">新建有线网络</translation>
     </message>
+    <message>
+        <location filename="../src/confform.cpp" line="451"/>
+        <source>kylin-nm</source>
+        <translation type="unfinished">网络工具</translation>
+    </message>
+    <message>
+        <location filename="../src/confform.cpp" line="454"/>
+        <source>kylin network applet desktop message</source>
+        <translation type="unfinished">麒麟网络工具信息提示</translation>
+    </message>
     <message>
         <source>create wired network successfully</source>
         <translation type="obsolete">已创建新的有线网络</translation>
@@ -1326,13 +1336,6 @@
         <translation type="obsolete">WPA 及 WPA2 企业</translation>
     </message>
 </context>
-<context>
-    <name>KylinDBus</name>
-    <message>
-        <source>kylin network applet desktop message</source>
-        <translation type="obsolete">麒麟网络工具信息提示</translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -1752,14 +1755,14 @@
 <context>
     <name>Utils</name>
     <message>
-        <location filename="../src/utils.cpp" line="84"/>
+        <location filename="../src/utils.cpp" line="88"/>
         <source>kylin-nm</source>
         <translation type="unfinished">网络工具</translation>
     </message>
     <message>
-        <location filename="../src/utils.cpp" line="87"/>
+        <location filename="../src/utils.cpp" line="91"/>
         <source>kylin network applet desktop message</source>
-        <translation type="unfinished">麒麟网络工具信息提示</translation>
+        <translation>麒麟网络工具信息提示</translation>
     </message>
 </context>
 <context>