Git commit 7bbda6563d9f192f8d4c83e0a71bf78a5055f669 by Nate Graham. Committed on 17/01/2026 at 03:15. Pushed by ngraham into branch 'master'.
applets: Use ampersands in the names The HIG recommends it because they're fancier, and another applet already uses them, so let's be consistent here. M +2 -2 README.md M +1 -1 applets/batterymonitor/main.qml M +1 -1 applets/batterymonitor/metadata.json M +1 -1 applets/brightness/main.qml M +1 -1 applets/brightness/metadata.json M +1 -1 applets/brightness/plugin/CMakeLists.txt M +2 -2 doc/kcm/index.docbook https://invent.kde.org/plasma/powerdevil/-/commit/7bbda6563d9f192f8d4c83e0a71bf78a5055f669 diff --git a/README.md b/README.md index 2ec0dcd6c..105fc387a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It is responsible for some (but not all) interactions with hardware functionalit * Monitor the current battery charge, and set charge thresholds for battery-powered devices that support it. * Keep track of system state - e.g. suspend/idle/etc. inhibitors, activities, screen locking - to adjust power management behaviors accordingly. * Communicate with underlying services such as [UPower](https://gitlab.freedesktop.org/upower/upower), [power-profiles-daemon](https://gitlab.freedesktop.org/upower/power-profiles-daemon), [ddcutil](https://github.com/rockowitz/ddcutil), and/or [systemd](https://systemd.io/) to implement some of the above. -* Provide a D-Bus interface for other Plasma components such as the Power Management applet or the Brightness and Color applet. +* Provide a D-Bus interface for other Plasma components such as the Power Management applet or the Brightness & Color applet. ## Related components @@ -17,7 +17,7 @@ It is responsible for some (but not all) interactions with hardware functionalit Directly interacting with this service, but not located in this repository: * The [Power Management applet](https://invent.kde.org/plasma/plasma-workspace/-/tree/master/applets/batterymonitor) in plasma-workspace. -* The [Brightness and Color applet](https://invent.kde.org/plasma/plasma-workspace/-/tree/master/applets/brightness), also part of plasma-workspace. +* The [Brightness & Color applet](https://invent.kde.org/plasma/plasma-workspace/-/tree/master/applets/brightness), also part of plasma-workspace. * Even [KRunner commands for PowerDevil actions](https://invent.kde.org/plasma/plasma-workspace/-/tree/master/runners/powerdevil) are part of plasma-workspace for some reason. * In a Wayland session, [KWin](https://invent.kde.org/plasma/kwin) takes over certain functionality related to user activity tracking and turning displays on/off which in X11 is managed by PowerDevil directly. * Plasma Mobile has [its own UI for power management settings](https://invent.kde.org/plasma/plasma-mobile/-/tree/master/kcms/powermanagement). diff --git a/applets/batterymonitor/main.qml b/applets/batterymonitor/main.qml index 9f40043e3..d35615c6b 100644 --- a/applets/batterymonitor/main.qml +++ b/applets/batterymonitor/main.qml @@ -94,7 +94,7 @@ PlasmoidItem { switchWidth: Kirigami.Units.gridUnit * 10 switchHeight: Kirigami.Units.gridUnit * 10 - Plasmoid.title: batteryControl.hasBatteries ? i18n("Power and Battery") : i18n("Power Management") + Plasmoid.title: batteryControl.hasBatteries ? i18n("Power & Battery") : i18n("Power Management") LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft LayoutMirroring.childrenInherit: true diff --git a/applets/batterymonitor/metadata.json b/applets/batterymonitor/metadata.json index 1a2cf8a35..dfd292242 100644 --- a/applets/batterymonitor/metadata.json +++ b/applets/batterymonitor/metadata.json @@ -136,7 +136,7 @@ ], "Icon": "battery-full", "License": "GPL-2.0+", - "Name": "Power and Battery", + "Name": "Power & Battery", "Name[ar]": "الطاقة والبطارية", "Name[bg]": "Захранване и батерия", "Name[ca@valencia]": "Energia i bateria", diff --git a/applets/brightness/main.qml b/applets/brightness/main.qml index cf7445e87..71a2b125f 100644 --- a/applets/brightness/main.qml +++ b/applets/brightness/main.qml @@ -92,7 +92,7 @@ PlasmoidItem { switchWidth: Kirigami.Units.gridUnit * 10 switchHeight: Kirigami.Units.gridUnit * 10 - Plasmoid.title: i18n("Brightness and Color") + Plasmoid.title: i18n("Brightness & Color") LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft LayoutMirroring.childrenInherit: true diff --git a/applets/brightness/metadata.json b/applets/brightness/metadata.json index 1b5f1bc91..fcb7b7ef5 100644 --- a/applets/brightness/metadata.json +++ b/applets/brightness/metadata.json @@ -179,7 +179,7 @@ ], "Icon": "brightness-high", "License": "GPL-2.0+", - "Name": "Brightness and Color", + "Name": "Brightness & Color", "Name[ar]": "السطوع والألوان", "Name[bg]": "Яркост и цветове", "Name[ca@valencia]": "Brillantor i color", diff --git a/applets/brightness/plugin/CMakeLists.txt b/applets/brightness/plugin/CMakeLists.txt index 32793d499..5201c16f9 100644 --- a/applets/brightness/plugin/CMakeLists.txt +++ b/applets/brightness/plugin/CMakeLists.txt @@ -27,7 +27,7 @@ ecm_qt_declare_logging_category(brightnesscontrolplugin IDENTIFIER "APPLETS::BRIGHTNESS" CATEGORY_NAME org.kde.applets.brightness DEFAULT_SEVERITY Warning - DESCRIPTION "Brightness and Color applet" EXPORT "APPLETS::BRIGHTNESS" + DESCRIPTION "Brightness & Color applet" EXPORT "APPLETS::BRIGHTNESS" ) ecm_finalize_qml_module(brightnesscontrolplugin) diff --git a/doc/kcm/index.docbook b/doc/kcm/index.docbook index f28a94537..61fd621b9 100644 --- a/doc/kcm/index.docbook +++ b/doc/kcm/index.docbook @@ -143,7 +143,7 @@ Laptop displays and keyboard backlights account for much of the power draw of an <listitem> <para>Define a brightness level to set when switching between <guilabel>On AC Power</guilabel>, <guilabel>On Battery</guilabel>, and <guilabel>On Low Battery</guilabel> power states. </para> -<para>Screen and keyboard brightness can also be changed on the fly through the <guilabel>Brightness and Color</guilabel> applet, as well as with keyboard shortcuts. Changing brightness on the fly will not affect the settings in this module. If no brightness level is set in this settings module, the brightness will remain the same when switching between power states. +<para>Screen and keyboard brightness can also be changed on the fly through the <guilabel>Brightness &amp; Color</guilabel> applet, as well as with keyboard shortcuts. Changing brightness on the fly will not affect the settings in this module. If no brightness level is set in this settings module, the brightness will remain the same when switching between power states. </para> </listitem> </varlistentry> @@ -174,7 +174,7 @@ Laptop displays and keyboard backlights account for much of the power draw of an <listitem> <para>Define system performance characteristics to set when switching between <guilabel>On AC Power</guilabel>, <guilabel>On Battery</guilabel>, and <guilabel>On Low Battery</guilabel> power states. A power profile such as <guilabel>Power Save</guilabel>, <guilabel>Balanced</guilabel> and <guilabel>Performance</guilabel> allows you to trade off performance vs. power consumption, which also affects the levels of heat and fan noise your system will produce. </para> -<para>Power profiles can also be changed on the fly through the <guilabel>Power and Battery</guilabel> applet, as well as with keyboard shortcuts. Changing power profiles on the fly will not affect the settings in this module. If no brightness level is set in this settings module, the brightness will remain the same when switching between power states. +<para>Power profiles can also be changed on the fly through the <guilabel>Power &amp; Battery</guilabel> applet, as well as with keyboard shortcuts. Changing power profiles on the fly will not affect the settings in this module. If no brightness level is set in this settings module, the brightness will remain the same when switching between power states. </para> </listitem> </varlistentry>
