Merge branch 'yhkylin/v101-fork' into 'yhkylin/v101'

修改BUG 183615 183827 183834 183840,网络部分字段缺失蒙古文翻译的问题  更新changelog,3.24.0.0-0k2.11

See merge request kylinos-src/kylin-nm!231
This commit is contained in:
陈学超 2023-07-26 10:14:36 +00:00
commit 702a72ad85
7 changed files with 111 additions and 96 deletions

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
kylin-nm (3.24.0.0-0k2.11) v101; urgency=medium
* BUG号:
-#183615 【蒙古文定制版本】【任务栏】托盘处“网络”图标悬浮未适配蒙文
-#183827 【WiFi】【蒙古文定制版本】部分未翻译为蒙文
-#183834 【网络连接】【蒙古文定制版本】部分未翻译为蒙文
-#183840 【网络】【蒙古文定制版本】部分未翻译为蒙文
-#184383 【wifi】编辑界面企业wifi与属性界面的ca证书信息不一致
-#184234 调整WiFi输入密码界面交互
* 需求号:
* 其他改动:
* 影响域:自身
-- cxc <chenxuechao@kylinos.cn> Wed, 26 Jul 2023 15:45:12 +0800
kylin-nm (3.24.0.0-0k2.10) v101; urgency=medium
* BUG号:

View File

@ -98,22 +98,22 @@
<message>
<location filename="../mobilehotspotwidget.cpp" line="61"/>
<source>Settings</source>
<translation>settings</translation>
<translation></translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings desktop message</source>
<translation>settings desktop message</translation>
<translation> </translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="336"/>
<source>use </source>
<translation>Use </translation>
<translation> </translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="337"/>
<source> share network, will interrupt local wireless connection</source>
<translation> Share network, will interrupt local wireless connection</translation>
<translation> </translation>
</message>
<message>
<location filename="../mobilehotspotwidget.cpp" line="353"/>

View File

@ -6,12 +6,12 @@
<message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/>
<source>Add Others</source>
<translation>add Others</translation>
<translation> </translation>
</message>
<message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/>
<source>Add WiredNetork</source>
<translation>add WiredNetork</translation>
<translation> </translation>
</message>
</context>
<context>
@ -50,18 +50,18 @@
<message>
<location filename="../netconnect.cpp" line="64"/>
<source>Settings</source>
<translation>settings</translation>
<translation></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="67"/>
<source>Settings desktop message</source>
<translation>settings desktop message</translation>
<translation> </translation>
</message>
<message>
<location filename="../netconnect.cpp" line="81"/>
<location filename="../netconnect.cpp" line="153"/>
<source>LAN</source>
<translation>lan</translation>
<translation> </translation>
</message>
<message>
<location filename="../netconnect.cpp" line="169"/>

View File

@ -5,8 +5,8 @@
<name>AptProxyDialog</name>
<message>
<location filename="../aptproxydialog.cpp" line="24"/>
<source>Set Apt Proxy</source>
<translation>Apt </translation>
<source>Set APT Proxy</source>
<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>
@ -118,9 +118,9 @@
</message>
<message>
<location filename="../proxy.cpp" line="471"/>
<source>Apt Proxy</source>
<translation>Apt </translation>
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path>
<source>APT Proxy</source>
<translation>APT </translation>
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message>
<message>
<location filename="../proxy.cpp" line="472"/>
@ -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"/>
@ -162,8 +162,8 @@
</message>
<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>
<source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation> APT </translation>
</message>
<message>
<location filename="../proxy.cpp" line="1017"/>

View File

@ -6,12 +6,12 @@
<message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="47"/>
<source>Add Others</source>
<translation>add Others</translation>
<translation> </translation>
</message>
<message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="51"/>
<source>Add WiredNetork</source>
<translation>add WiredNetork</translation>
<translation> </translation>
</message>
</context>
<context>

View File

@ -6,12 +6,12 @@
<message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/>
<source>Add Others</source>
<translation>add Others</translation>
<translation> </translation>
</message>
<message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/>
<source>Add WiredNetork</source>
<translation>add WiredNetork</translation>
<translation> </translation>
</message>
</context>
<context>
@ -53,12 +53,12 @@
<message>
<location filename="../wlanconnect.cpp" line="123"/>
<source>Settings</source>
<translation>settings</translation>
<translation></translation>
</message>
<message>
<location filename="../wlanconnect.cpp" line="126"/>
<source>Settings desktop message</source>
<translation>settings desktop message</translation>
<translation> </translation>
</message>
<message>
<location filename="../wlanconnect.cpp" line="228"/>

View File

@ -37,22 +37,22 @@
<message>
<location filename="../frontend/netdetails/configpage.cpp" line="62"/>
<source>Network profile type</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/configpage.cpp" line="65"/>
<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>
<translation> ( ) .</translation>
</message>
<message>
<location filename="../frontend/netdetails/configpage.cpp" line="69"/>
<source>Private Devices on the network can discover this computer. Generally applicable to a network at home or work where you know and trust the individuals and devices on the network.</source>
<translation type="unfinished"></translation>
<translation> .</translation>
</message>
<message>
<location filename="../frontend/netdetails/configpage.cpp" line="73"/>
<source>Config firewall and security settings</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -450,47 +450,47 @@
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="34"/>
<source>DNS Server Advanced Settings</source>
<translation type="unfinished"></translation>
<translation>DNS </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="37"/>
<source>Tactic</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="40"/>
<source>Timeout</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="43"/>
<source>Retry Count</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="46"/>
<source>order</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="47"/>
<source>rotate</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="48"/>
<source>concurrency</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="53"/>
<source> s</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="59"/>
<source> times</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/dnssettingwidget.cpp" line="72"/>
@ -516,17 +516,17 @@
<message>
<location filename="../frontend/enterprise-wlan/enterprisewlandialog.cpp" line="106"/>
<source>Wi-Fi network requires authentication</source>
<translation type="unfinished"></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 type="unfinished"></translation>
<translation>Wi-Fi </translation>
</message>
<message>
<location filename="../frontend/enterprise-wlan/enterprisewlandialog.cpp" line="113"/>
<source>&quot; requires a password or encryption key.</source>
<translation type="unfinished"></translation>
<translation> .</translation>
</message>
<message>
<location filename="../frontend/enterprise-wlan/enterprisewlandialog.cpp" line="148"/>
@ -544,22 +544,22 @@
<message>
<location filename="../frontend/networkmode/firewalldialog.cpp" line="85"/>
<source>Allow other devices on this network to discover this computer?</source>
<translation type="unfinished"></translation>
<translation> ?</translation>
</message>
<message>
<location filename="../frontend/networkmode/firewalldialog.cpp" line="87"/>
<source>It is not recommended to enable this feature on public networks</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/networkmode/firewalldialog.cpp" line="89"/>
<source>Not allowed (recommended)</source>
<translation type="unfinished"></translation>
<translation> ( )</translation>
</message>
<message>
<location filename="../frontend/networkmode/firewalldialog.cpp" line="90"/>
<source>Allowed</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -621,7 +621,7 @@
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="378"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -683,7 +683,7 @@
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="303"/>
<source>Address conflict</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -691,27 +691,27 @@
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="137"/>
<source>Please enter the network information</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="142"/>
<source>Network name(SSID)</source>
<translation type="unfinished"></translation>
<translation> (SSID)</translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="143"/>
<source>Show Network List</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="144"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="145"/>
<source>Join</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="148"/>
@ -721,7 +721,7 @@
<message>
<location filename="../frontend/netdetails/joinhiddenwifipage.cpp" line="150"/>
<source>Find and Join WLAN</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -754,13 +754,13 @@
<location filename="../frontend/list-items/lanlistitem.cpp" line="152"/>
<location filename="../frontend/list-items/lanlistitem.cpp" line="168"/>
<source>Property</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/list-items/lanlistitem.cpp" line="153"/>
<location filename="../frontend/list-items/lanlistitem.cpp" line="170"/>
<source>Delete</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -778,7 +778,7 @@
<message>
<location filename="../frontend/tab-pages/lanpage.cpp" line="67"/>
<source>conflict, unable to connect to the network normally!</source>
<translation type="unfinished"></translation>
<translation> !</translation>
</message>
<message>
<location filename="../frontend/tab-pages/lanpage.cpp" line="746"/>
@ -807,17 +807,17 @@
<location filename="../frontend/tab-pages/lanpage.cpp" line="1325"/>
<location filename="../frontend/tab-pages/lanpage.cpp" line="1333"/>
<source>Connected: </source>
<translation type="unfinished"></translation>
<translation>: </translation>
</message>
<message>
<location filename="../frontend/tab-pages/lanpage.cpp" line="1327"/>
<source>Not Connected</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/tab-pages/lanpage.cpp" line="1325"/>
<source>(Limited)</source>
<translation type="unfinished"></translation>
<translation>( )</translation>
</message>
</context>
<context>
@ -860,24 +860,24 @@
<message>
<location filename="../frontend/mainwindow.cpp" line="330"/>
<source>Settings</source>
<translatorcomment></translatorcomment>
<translatorcomment> </translatorcomment>
<translation> </translation>
</message>
<message>
<location filename="../frontend/mainwindow.cpp" line="572"/>
<location filename="../frontend/mainwindow.cpp" line="776"/>
<source>Network tool</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/mainwindow.cpp" line="586"/>
<source>Network Card</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/mainwindow.cpp" line="759"/>
<source>Not connected to the network</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -885,17 +885,17 @@
<message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="57"/>
<source>DNS server(Drag to sort)</source>
<translation type="unfinished"></translation>
<translation>DNS </translation>
</message>
<message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="64"/>
<source>Click &quot;+&quot; to configure DNS</source>
<translation type="unfinished"></translation>
<translation>&quot;+&quot; / DNS / </translation>
</message>
<message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="101"/>
<source>Settings</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -938,7 +938,7 @@
<location filename="../frontend/netdetails/netdetail.cpp" line="365"/>
<location filename="../frontend/netdetails/netdetail.cpp" line="372"/>
<source>Config</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="384"/>
@ -958,7 +958,7 @@
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="446"/>
<source>Delete this network</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/netdetail.cpp" line="425"/>
@ -1131,7 +1131,7 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="107"/>
<source>Remember the Network</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="232"/>
@ -1187,14 +1187,14 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="246"/>
<source>Password options</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="247"/>
<location filename="../frontend/netdetails/securitypage.cpp" line="255"/>
<location filename="../frontend/netdetails/securitypage.h" line="125"/>
<source>Required</source>
<translation></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="251"/>
@ -1254,32 +1254,32 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="281"/>
<source>Store passwords only for this user</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="281"/>
<source>Store password only for this user</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="283"/>
<source>Store passwords for all users</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="283"/>
<source>Store password for all users</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="285"/>
<source>Ask this password every time</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="285"/>
<source>Ask password every time</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1150"/>
@ -1296,47 +1296,47 @@
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="290"/>
<source>PAC provisioning</source>
<translation type="unfinished"></translation>
<translation>PAC </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="291"/>
<source>Allow automatic PAC provisioning</source>
<translation type="unfinished"></translation>
<translation> PAC </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="292"/>
<source>PAC file</source>
<translation type="unfinished"></translation>
<translation>PAC </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="293"/>
<source>Anonymous</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="294"/>
<source>Authenticated</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="295"/>
<source>Both</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1256"/>
<source>Choose a PAC file</source>
<translation type="unfinished"></translation>
<translation> PAC </translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.cpp" line="1257"/>
<source>PAC Files (*.pac)</source>
<translation type="unfinished"></translation>
<translation>PAC (*.pac)</translation>
</message>
<message>
<location filename="../frontend/netdetails/securitypage.h" line="126"/>
<source> </source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
</context>
<context>
@ -1445,7 +1445,7 @@
<location filename="../frontend/list-items/wlanlistitem.cpp" line="189"/>
<location filename="../frontend/list-items/wlanlistitem.cpp" line="710"/>
<source>Property</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../frontend/list-items/wlanlistitem.cpp" line="359"/>
@ -1505,17 +1505,17 @@
<location filename="../frontend/tab-pages/wlanpage.cpp" line="1680"/>
<location filename="../frontend/tab-pages/wlanpage.cpp" line="1687"/>
<source>Connected: </source>
<translation type="unfinished"></translation>
<translation>: </translation>
</message>
<message>
<location filename="../frontend/tab-pages/wlanpage.cpp" line="1682"/>
<source>Not Connected</source>
<translation type="unfinished"></translation>
<translation> </translation>
</message>
<message>
<location filename="../frontend/tab-pages/wlanpage.cpp" line="1680"/>
<source>(Limited)</source>
<translation type="unfinished"></translation>
<translation>( )</translation>
</message>
</context>
<context>
@ -1578,17 +1578,17 @@
<message>
<location filename="../main.cpp" line="96"/>
<source>kylinnm</source>
<translation>Kylinnm</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="100"/>
<source>show kylin-nm wifi page</source>
<translation>Show kylin-nm wifi page</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="101"/>
<source>show kylin-nm lan page</source>
<translation>Show kylin-nm lan page</translation>
<translation type="unfinished"></translation>
</message>
</context>
</TS>