openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2309bug-0711pm' into 'yhkylin/v101' 

fix bug 181168 181824

See merge request kylinos-src/kylin-nm!214
This commit is contained in:
赵世旭 2023-07-11 09:26:33 +00:00
parent 2cf9ab4ecd c50795326d
commit 28c921e3ef
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/proxy/aptproxydialog.cpp
View File

@ -21,7 +21,7 @@ AptProxyDialog::~AptProxyDialog()
void AptProxyDialog::initUi() void AptProxyDialog::initUi()
{ {
setWindowTitle(tr("Set Apt Proxy")); setWindowTitle(tr("Set APT Proxy"));
this->setFixedSize(480, 200); this->setFixedSize(480, 200);
QVBoxLayout *mAptProxyLyt = new QVBoxLayout(this); QVBoxLayout *mAptProxyLyt = new QVBoxLayout(this);

4
plugins/proxy/proxy.cpp
View File

@ -475,8 +475,8 @@ void Proxy::retranslateUi()
//~ contents_path /Proxy/App Proxy //~ contents_path /Proxy/App Proxy
tr("App Proxy"); tr("App Proxy");
//~ contents_path /Proxy/Apt Proxy //~ contents_path /Proxy/APT Proxy
mAptProxyLabel->setText(tr("Apt Proxy")); mAptProxyLabel->setText(tr("APT Proxy"));
mAptLabel->setText(tr("Open")); mAptLabel->setText(tr("Open"));
mAPTHostLabel_1->setText(tr("Server Address : ")); mAPTHostLabel_1->setText(tr("Server Address : "));
mAPTPortLabel_1->setText(tr("Port : ")); mAPTPortLabel_1->setText(tr("Port : "));

12
plugins/proxy/translations/bo_CN.ts
View File

@ -5,8 +5,8 @@
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="24"/>
<source>Set Apt Proxy</source> <source>Set APT Proxy</source>
<translation>Apt ངོ་ཚབ་ བཙུགས་པ།</translation> <translation>APT ངོ་ཚབ་ བཙུགས་པ།</translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="41"/> <location filename="../aptproxydialog.cpp" line="41"/>
@ -118,9 +118,9 @@
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="471"/>
<source>Apt Proxy</source> <source>APT Proxy</source>
<translation>APT ཚབ་བྱེད་མི་སྣ།</translation> <translation>APT ཚབ་བྱེད་མི་སྣ།</translation>
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="472"/>
@ -162,8 +162,8 @@
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="813"/>
<source>The system needs to be restarted to set the Apt proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation>མ་ལག་འདི་བསྐྱར་དུ་འགོ་ཚུགས་ནས་Aptཡི་ཚབ་བྱེད་འཕྲུལ་ཆས་གཏན་འཁེལ་བྱེད་དགོས་པ་དང་། བསྐྱར་དུ་འགོ་འཛུགས་དགོས་མིན་</translation> <translation>མ་ལག་འདི་བསྐྱར་དུ་འགོ་ཚུགས་ནས་APT ཡི་ཚབ་བྱེད་འཕྲུལ་ཆས་གཏན་འཁེལ་བྱེད་དགོས་པ་དང་། བསྐྱར་དུ་འགོ་འཛུགས་དགོས་མིན་</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1017"/> <location filename="../proxy.cpp" line="1017"/>

8
plugins/proxy/translations/en_US.ts
View File

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

8
plugins/proxy/translations/tr.ts
View File

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

8
plugins/proxy/translations/zh_CN.ts
View File

@ -5,7 +5,7 @@
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="24"/>
<source>Set Apt Proxy</source> <source>Set APT Proxy</source>
<translation>设置 APT 代理</translation> <translation>设置 APT 代理</translation>
</message> </message>
<message> <message>
@ -118,9 +118,9 @@
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="471"/>
<source>Apt Proxy</source> <source>APT Proxy</source>
<translation>APT 代理</translation> <translation>APT 代理</translation>
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="472"/>
@ -162,7 +162,7 @@
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="813"/>
<source>The system needs to be restarted to set the Apt proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation>设置 APT 代理需要重启系统后生效，是否重启系统</translation> <translation>设置 APT 代理需要重启系统后生效，是否重启系统</translation>
</message> </message>
<message> <message>

2
src/translations/kylin-nm_bo_CN.ts
View File

@ -909,7 +909,7 @@
<message> <message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="57"/> <location filename="../frontend/netdetails/multiplednswidget.cpp" line="57"/>
<source>DNS server(Drag to sort)</source> <source>DNS server(Drag to sort)</source>
<translation>DNS ཞབས་ཞུའི་ཡོ་བྱད། (འདྲུད་འཐེན་曳་གོ་རིམ། )</translation> <translation>DNS ཞབས་ཞུའི་ཡོ་བྱད། (འཐེན་འགུལ་ལ་བརྟེན་ནས་རིམ་སྒྲིག་།)</translation>
</message> </message>
<message> <message>
<location filename="../frontend/netdetails/multiplednswidget.cpp" line="64"/> <location filename="../frontend/netdetails/multiplednswidget.cpp" line="64"/>