Merge branch '2309-0810mm' into 'yhkylin/v101'
fix(APT proxy): modify APT text and update translation files(bug#187090) See merge request kylinos-src/kylin-nm!243
This commit is contained in:
commit
6027099c04
|
@ -582,7 +582,7 @@ void Proxy::setupConnect(){
|
||||||
} else {
|
} else {
|
||||||
QMessageBox *mReboot = new QMessageBox(pluginWidget->topLevelWidget());
|
QMessageBox *mReboot = new QMessageBox(pluginWidget->topLevelWidget());
|
||||||
mReboot->setIcon(QMessageBox::Warning);
|
mReboot->setIcon(QMessageBox::Warning);
|
||||||
mReboot->setText(tr("The apt proxy has been turned off and needs to be restarted to take effect"));
|
mReboot->setText(tr("The APT proxy has been turned off and needs to be restarted to take effect"));
|
||||||
QPushButton *laterbtn = mReboot->addButton(tr("Reboot Later"), QMessageBox::RejectRole);
|
QPushButton *laterbtn = mReboot->addButton(tr("Reboot Later"), QMessageBox::RejectRole);
|
||||||
QPushButton *nowbtn = mReboot->addButton(tr("Reboot Now"), QMessageBox::AcceptRole);
|
QPushButton *nowbtn = mReboot->addButton(tr("Reboot Now"), QMessageBox::AcceptRole);
|
||||||
mReboot->exec();
|
mReboot->exec();
|
||||||
|
@ -819,7 +819,7 @@ void Proxy::setAptInfo()
|
||||||
{
|
{
|
||||||
QMessageBox *mReboot = new QMessageBox(pluginWidget->topLevelWidget());
|
QMessageBox *mReboot = new QMessageBox(pluginWidget->topLevelWidget());
|
||||||
mReboot->setIcon(QMessageBox::Warning);
|
mReboot->setIcon(QMessageBox::Warning);
|
||||||
mReboot->setText(tr("The system needs to be restarted to set the Apt proxy, whether to reboot"));
|
mReboot->setText(tr("The system needs to be restarted to set the APT proxy, whether to reboot"));
|
||||||
QPushButton *laterbtn = mReboot->addButton(tr("Reboot Later"), QMessageBox::RejectRole);
|
QPushButton *laterbtn = mReboot->addButton(tr("Reboot Later"), QMessageBox::RejectRole);
|
||||||
QPushButton *nowbtn = mReboot->addButton(tr("Reboot Now"), QMessageBox::AcceptRole);
|
QPushButton *nowbtn = mReboot->addButton(tr("Reboot Now"), QMessageBox::AcceptRole);
|
||||||
mReboot->exec();
|
mReboot->exec();
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../proxy.cpp" line="573"/>
|
<location filename="../proxy.cpp" line="573"/>
|
||||||
<source>The apt proxy has been turned off and needs to be restarted to take effect</source>
|
<source>The APT proxy has been turned off and needs to be restarted to take effect</source>
|
||||||
<translation>ངོ་ཚབ་ཀྱི་སྒོ་བརྒྱབ་ཟིན་པས་ཡང་བསྐྱར་ནུས་པ་ཐོན་པར་བྱ་དགོས།</translation>
|
<translation>ངོ་ཚབ་ཀྱི་སྒོ་བརྒྱབ་ཟིན་པས་ཡང་བསྐྱར་ནུས་པ་ཐོན་པར་བྱ་དགོས།</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../proxy.cpp" line="573"/>
|
<location filename="../proxy.cpp" line="573"/>
|
||||||
<source>The apt proxy has been turned off and needs to be restarted to take effect</source>
|
<source>The APT proxy has been turned off and needs to be restarted to take effect</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../proxy.cpp" line="573"/>
|
<location filename="../proxy.cpp" line="573"/>
|
||||||
<source>The apt proxy has been turned off and needs to be restarted to take effect</source>
|
<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>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../proxy.cpp" line="573"/>
|
<location filename="../proxy.cpp" line="573"/>
|
||||||
<source>The apt proxy has been turned off and needs to be restarted to take effect</source>
|
<source>The APT proxy has been turned off and needs to be restarted to take effect</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../proxy.cpp" line="573"/>
|
<location filename="../proxy.cpp" line="573"/>
|
||||||
<source>The apt proxy has been turned off and needs to be restarted to take effect</source>
|
<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>
|
||||||
<message>
|
<message>
|
||||||
|
|
Loading…
Reference in New Issue