diff --git a/Modules/Panels/Settings/Tabs/Display/DisplayTab.qml b/Modules/Panels/Settings/Tabs/Display/DisplayTab.qml index 4f8b71b36..4cc8b9c76 100644 --- a/Modules/Panels/Settings/Tabs/Display/DisplayTab.qml +++ b/Modules/Panels/Settings/Tabs/Display/DisplayTab.qml @@ -40,7 +40,7 @@ ColumnLayout { if (exitCode === 0) { Settings.data.nightLight.enabled = true; NightLightService.apply(); - ToastService.showNotice(I18n.tr("common.night-light"), I18n.tr("toast.wifi.enabled"), "nightlight-on"); + ToastService.showNotice(I18n.tr("common.night-light"), I18n.tr("common.enabled"), "nightlight-on"); } else { Settings.data.nightLight.enabled = false; ToastService.showWarning(I18n.tr("common.night-light"), I18n.tr("toast.night-light.not-installed")); diff --git a/Modules/Panels/Settings/Tabs/Display/NightLightSubTab.qml b/Modules/Panels/Settings/Tabs/Display/NightLightSubTab.qml index bc85b6c4f..982910e95 100644 --- a/Modules/Panels/Settings/Tabs/Display/NightLightSubTab.qml +++ b/Modules/Panels/Settings/Tabs/Display/NightLightSubTab.qml @@ -26,7 +26,7 @@ ColumnLayout { Settings.data.nightLight.enabled = false; Settings.data.nightLight.forced = false; NightLightService.apply(); - ToastService.showNotice(I18n.tr("common.night-light"), I18n.tr("toast.wifi.disabled"), "nightlight-off"); + ToastService.showNotice(I18n.tr("common.night-light"), I18n.tr("common.disabled"), "nightlight-off"); } } } diff --git a/Services/Location/NightLightService.qml b/Services/Location/NightLightService.qml index abea6aaf3..59a8744a7 100644 --- a/Services/Location/NightLightService.qml +++ b/Services/Location/NightLightService.qml @@ -65,7 +65,7 @@ Singleton { apply(); // Toast: night light toggled const enabled = !!Settings.data.nightLight.enabled; - ToastService.showNotice(I18n.tr("common.night-light"), enabled ? I18n.tr("toast.wifi.enabled") : I18n.tr("toast.wifi.disabled"), enabled ? "nightlight-on" : "nightlight-off"); + ToastService.showNotice(I18n.tr("common.night-light"), enabled ? I18n.tr("common.enabled") : I18n.tr("common.disabled"), enabled ? "nightlight-on" : "nightlight-off"); } function onForcedChanged() { apply(); diff --git a/Services/Networking/BluetoothService.qml b/Services/Networking/BluetoothService.qml index 15e92b388..5dacaf026 100644 --- a/Services/Networking/BluetoothService.qml +++ b/Services/Networking/BluetoothService.qml @@ -233,10 +233,10 @@ Singleton { if (bluetoothBlockedToggled) { checkWifiBlocked.running = true; } else if (adapter.state === BluetoothAdapter.Enabled) { - ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("toast.wifi.enabled"), "bluetooth"); + ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("common.enabled"), "bluetooth"); Logger.d("Bluetooth", "Adapter enabled"); } else if (adapter.state === BluetoothAdapter.Disabled) { - ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("toast.wifi.disabled"), "bluetooth-off"); + ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("common.disabled"), "bluetooth-off"); Logger.d("Bluetooth", "Adapter disabled"); } } @@ -255,17 +255,17 @@ Singleton { root.airplaneModeToggled = true; root.lastWifiBlocked = true; NetworkService.setWifiEnabled(false); - ToastService.showNotice(I18n.tr("toast.airplane-mode.title"), I18n.tr("toast.wifi.enabled"), "plane"); + ToastService.showNotice(I18n.tr("toast.airplane-mode.title"), I18n.tr("common.enabled"), "plane"); } else if (!wifiBlocked && lastWifiBlocked) { root.airplaneModeToggled = true; root.lastWifiBlocked = false; NetworkService.setWifiEnabled(true); - ToastService.showNotice(I18n.tr("toast.airplane-mode.title"), I18n.tr("toast.wifi.disabled"), "plane-off"); + ToastService.showNotice(I18n.tr("toast.airplane-mode.title"), I18n.tr("common.disabled"), "plane-off"); } else if (adapter.enabled) { - ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("toast.wifi.enabled"), "bluetooth"); + ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("common.enabled"), "bluetooth"); Logger.d("Bluetooth", "Adapter enabled"); } else { - ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("toast.wifi.disabled"), "bluetooth-off"); + ToastService.showNotice(I18n.tr("common.bluetooth"), I18n.tr("common.disabled"), "bluetooth-off"); Logger.d("Bluetooth", "Adapter disabled"); } root.airplaneModeToggled = false; diff --git a/Services/Networking/NetworkService.qml b/Services/Networking/NetworkService.qml index 084abf8b5..b2db005a6 100644 --- a/Services/Networking/NetworkService.qml +++ b/Services/Networking/NetworkService.qml @@ -69,14 +69,14 @@ Singleton { function onWifiEnabledChanged() { if (Settings.data.network.wifiEnabled) { if (!BluetoothService.airplaneModeToggled) { - ToastService.showNotice(I18n.tr("wifi.panel.title"), I18n.tr("toast.wifi.enabled"), "wifi"); + ToastService.showNotice(I18n.tr("wifi.panel.title"), I18n.tr("common.enabled"), "wifi"); } // Perform a scan to update the UI delayedScanTimer.interval = 3000; delayedScanTimer.restart(); } else { if (!BluetoothService.airplaneModeToggled) { - ToastService.showNotice(I18n.tr("wifi.panel.title"), I18n.tr("toast.wifi.disabled"), "wifi-off"); + ToastService.showNotice(I18n.tr("wifi.panel.title"), I18n.tr("common.disabled"), "wifi-off"); } // Clear networks so the widget icon changes root.networks = ({}); diff --git a/Services/Power/IdleInhibitorService.qml b/Services/Power/IdleInhibitorService.qml index 9c856d3ac..4a6b5c103 100644 --- a/Services/Power/IdleInhibitorService.qml +++ b/Services/Power/IdleInhibitorService.qml @@ -218,7 +218,7 @@ Singleton { if (activeInhibitors.includes("manual")) { removeInhibitor("manual"); - ToastService.showNotice(I18n.tr("tooltips.keep-awake"), I18n.tr("toast.wifi.disabled"), "keep-awake-off"); + ToastService.showNotice(I18n.tr("tooltips.keep-awake"), I18n.tr("common.disabled"), "keep-awake-off"); Logger.i("IdleInhibitor", "Manual inhibition disabled"); } } @@ -226,7 +226,7 @@ Singleton { function addManualInhibitor(timeoutSec) { if (!activeInhibitors.includes("manual")) { addInhibitor("manual", "Manually activated by user"); - ToastService.showNotice(I18n.tr("tooltips.keep-awake"), I18n.tr("toast.wifi.enabled"), "keep-awake-on"); + ToastService.showNotice(I18n.tr("tooltips.keep-awake"), I18n.tr("common.enabled"), "keep-awake-on"); } if (timeoutSec === null && timeout === null) { diff --git a/Services/Theming/ColorSchemeService.qml b/Services/Theming/ColorSchemeService.qml index 8f919cb34..1e7727f69 100644 --- a/Services/Theming/ColorSchemeService.qml +++ b/Services/Theming/ColorSchemeService.qml @@ -27,7 +27,7 @@ Singleton { // Toast: dark/light mode switched const enabled = !!Settings.data.colorSchemes.darkMode; const label = enabled ? I18n.tr("tooltips.switch-to-dark-mode") : I18n.tr("tooltips.switch-to-light-mode"); - const description = I18n.tr("toast.wifi.enabled"); + const description = I18n.tr("common.enabled"); ToastService.showNotice(label, description, "dark-mode"); } }