Merge branch '2309bug-0711pm' into 'yhkylin/v101'
fix bug 181168 181824 See merge request kylinos-src/kylin-nm!214
This commit is contained in:
commit
28c921e3ef
|
@ -21,7 +21,7 @@ AptProxyDialog::~AptProxyDialog()
|
|||
|
||||
void AptProxyDialog::initUi()
|
||||
{
|
||||
setWindowTitle(tr("Set Apt Proxy"));
|
||||
setWindowTitle(tr("Set APT Proxy"));
|
||||
this->setFixedSize(480, 200);
|
||||
|
||||
QVBoxLayout *mAptProxyLyt = new QVBoxLayout(this);
|
||||
|
|
|
@ -475,8 +475,8 @@ void Proxy::retranslateUi()
|
|||
//~ contents_path /Proxy/App Proxy
|
||||
tr("App Proxy");
|
||||
|
||||
//~ contents_path /Proxy/Apt Proxy
|
||||
mAptProxyLabel->setText(tr("Apt Proxy"));
|
||||
//~ contents_path /Proxy/APT Proxy
|
||||
mAptProxyLabel->setText(tr("APT Proxy"));
|
||||
mAptLabel->setText(tr("Open"));
|
||||
mAPTHostLabel_1->setText(tr("Server Address : "));
|
||||
mAPTPortLabel_1->setText(tr("Port : "));
|
||||
|
|
|
@ -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"/>
|
||||
|
@ -118,9 +118,9 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="471"/>
|
||||
<source>Apt Proxy</source>
|
||||
<source>APT Proxy</source>
|
||||
<translation>APT ཚབ་བྱེད་མི་སྣ།</translation>
|
||||
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path>
|
||||
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="472"/>
|
||||
|
@ -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"/>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<name>AptProxyDialog</name>
|
||||
<message>
|
||||
<location filename="../aptproxydialog.cpp" line="24"/>
|
||||
<source>Set Apt Proxy</source>
|
||||
<source>Set APT Proxy</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -118,9 +118,9 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="471"/>
|
||||
<source>Apt Proxy</source>
|
||||
<source>APT Proxy</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path>
|
||||
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="472"/>
|
||||
|
@ -162,7 +162,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<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>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<name>AptProxyDialog</name>
|
||||
<message>
|
||||
<location filename="../aptproxydialog.cpp" line="24"/>
|
||||
<source>Set Apt Proxy</source>
|
||||
<source>Set APT Proxy</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -118,9 +118,9 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="471"/>
|
||||
<source>Apt Proxy</source>
|
||||
<source>APT Proxy</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path>
|
||||
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="472"/>
|
||||
|
@ -162,7 +162,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<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>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<name>AptProxyDialog</name>
|
||||
<message>
|
||||
<location filename="../aptproxydialog.cpp" line="24"/>
|
||||
<source>Set Apt Proxy</source>
|
||||
<source>Set APT Proxy</source>
|
||||
<translation>设置 APT 代理</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -118,9 +118,9 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="471"/>
|
||||
<source>Apt Proxy</source>
|
||||
<source>APT Proxy</source>
|
||||
<translation>APT 代理</translation>
|
||||
<extra-contents_path>/Proxy/Apt Proxy</extra-contents_path>
|
||||
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../proxy.cpp" line="472"/>
|
||||
|
@ -162,7 +162,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<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>
|
||||
</message>
|
||||
<message>
|
||||
|
|
|
@ -909,7 +909,7 @@
|
|||
<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"/>
|
||||
|
|
Loading…
Reference in New Issue