diff --git a/src/dcc-update-plugin/qml/UpdateSetting.qml b/src/dcc-update-plugin/qml/UpdateSetting.qml index 7650d288..0830b4bc 100644 --- a/src/dcc-update-plugin/qml/UpdateSetting.qml +++ b/src/dcc-update-plugin/qml/UpdateSetting.qml @@ -335,6 +335,7 @@ DccObject { parentName: "advancedSettingGroup" weight: 40 visible: dccData.work().p2pUpdateSupported() + enabled: !dccData.model().updateProhibited pageType: DccObject.Item page: DccGroupView { height: implicitHeight + 10 @@ -353,7 +354,7 @@ DccObject { displayName: qsTr("Delivery Optimization") description: qsTr("When enabled, your device may share previously downloaded system updates with other devices on your local network.When you turn it off, cached files from update delivery will be cleared during the next restart.") weight: 10 - enabled: !dccData.model().isPrivateUpdate + enabled: !dccData.model().isPrivateUpdate && !dccData.model().updateProhibited pageType: DccObject.Editor page: D.Switch { id: upgradeDeliverySwitch @@ -382,7 +383,7 @@ DccObject { displayName: qsTr("Delivery Optimization-Upload throttling") visible: dccData.model().upgradeDeliveryEnable weight: 20 - enabled: !dccData.model().upgradeUploadSpeedIsOnline + enabled: !dccData.model().upgradeUploadSpeedIsOnline && !dccData.model().updateProhibited pageType: DccObject.Item Connections { target: dccData.model() @@ -486,7 +487,7 @@ DccObject { displayName: qsTr("Delivery Optimization-Limit Speed") visible: dccData.model().upgradeDeliveryEnable weight: 30 - enabled: !dccData.model().upgradeDownloadSpeedIsOnline + enabled: !dccData.model().upgradeDownloadSpeedIsOnline && !dccData.model().updateProhibited pageType: DccObject.Item Connections { target: dccData.model() diff --git a/src/private-lastore-tray/privatelastoreplugin.cpp b/src/private-lastore-tray/privatelastoreplugin.cpp index f6843415..13d01475 100644 --- a/src/private-lastore-tray/privatelastoreplugin.cpp +++ b/src/private-lastore-tray/privatelastoreplugin.cpp @@ -48,7 +48,7 @@ const QString PrivateLastorePlugin::pluginName() const const QString PrivateLastorePlugin::pluginDisplayName() const { - return tr("Private Lastore"); + return tr("Private Update"); } void PrivateLastorePlugin::init(PluginProxyInterface *proxyInter) diff --git a/src/private-lastore-tray/tipswidget.cpp b/src/private-lastore-tray/tipswidget.cpp index 72be64a1..12380a4a 100644 --- a/src/private-lastore-tray/tipswidget.cpp +++ b/src/private-lastore-tray/tipswidget.cpp @@ -64,7 +64,7 @@ bool TipsWidget::checkShutdownUpdate() int lastoreStatus = DConfigHelper::instance()->getConfig("org.deepin.dde.lastore", "org.deepin.dde.lastore", "","lastore-daemon-status", 0).toInt(); if (lastoreStatus == SHUTDOWNUPDATESTATUS) { m_textList.append(tr("Download complete")); - m_textList.append(tr("Shutdown update")); + m_textList.append(tr("Updates will begin on the next shutdown or restart")); return true; } else { return false; diff --git a/src/private-lastore-tray/translations/private-lastore-tray_en.ts b/src/private-lastore-tray/translations/private-lastore-tray_en.ts index 782539a0..7aca8378 100644 --- a/src/private-lastore-tray/translations/private-lastore-tray_en.ts +++ b/src/private-lastore-tray/translations/private-lastore-tray_en.ts @@ -4,7 +4,7 @@ PrivateLastorePlugin - Private Lastore + Private Update @@ -15,7 +15,7 @@ - Shutdown update + Updates will begin on the next shutdown or restart diff --git a/src/private-lastore-tray/translations/private-lastore-tray_en_US.ts b/src/private-lastore-tray/translations/private-lastore-tray_en_US.ts index 782539a0..7aca8378 100644 --- a/src/private-lastore-tray/translations/private-lastore-tray_en_US.ts +++ b/src/private-lastore-tray/translations/private-lastore-tray_en_US.ts @@ -4,7 +4,7 @@ PrivateLastorePlugin - Private Lastore + Private Update @@ -15,7 +15,7 @@ - Shutdown update + Updates will begin on the next shutdown or restart diff --git a/src/private-lastore-tray/translations/private-lastore-tray_zh_CN.ts b/src/private-lastore-tray/translations/private-lastore-tray_zh_CN.ts index 16bf9bdb..2ea6240e 100644 --- a/src/private-lastore-tray/translations/private-lastore-tray_zh_CN.ts +++ b/src/private-lastore-tray/translations/private-lastore-tray_zh_CN.ts @@ -4,8 +4,8 @@ PrivateLastorePlugin - Private Lastore - 更新独立客户端 + Private Update + 私有化更新 @@ -15,7 +15,7 @@ 更新包下载完成 - Shutdown update + Updates will begin on the next shutdown or restart 将在下次关机/重启时开始更新 diff --git a/src/private-lastore-tray/translations/private-lastore-tray_zh_HK.ts b/src/private-lastore-tray/translations/private-lastore-tray_zh_HK.ts index 7789dc2a..6470b612 100644 --- a/src/private-lastore-tray/translations/private-lastore-tray_zh_HK.ts +++ b/src/private-lastore-tray/translations/private-lastore-tray_zh_HK.ts @@ -4,8 +4,8 @@ PrivateLastorePlugin - Private Lastore - 更新獨立客戶端 + Private Update + 私有化更新 @@ -15,7 +15,7 @@ 更新包下載完成 - Shutdown update + Updates will begin on the next shutdown or restart 將在下次關機/重啟時開始更新 diff --git a/src/private-lastore-tray/translations/private-lastore-tray_zh_TW.ts b/src/private-lastore-tray/translations/private-lastore-tray_zh_TW.ts index 7112f93e..be3b003d 100644 --- a/src/private-lastore-tray/translations/private-lastore-tray_zh_TW.ts +++ b/src/private-lastore-tray/translations/private-lastore-tray_zh_TW.ts @@ -4,8 +4,8 @@ PrivateLastorePlugin - Private Lastore - 更新獨立客戶端 + Private Update + 私有化更新 @@ -15,7 +15,7 @@ 更新包下載完成 - Shutdown update + Updates will begin on the next shutdown or restart 將在下次關機/重新啟動時開始更新