From 9153436fff348433fbb0efdade9699a2f2d7794a Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 24 Oct 2015 12:16:13 +0200 Subject: [PATCH] Cherry-picking upstream version 0.9.0+20151024. --- config/lidwatchersettings.ui | 2 +- debian/changelog | 6 ++++++ src/batteryhelper.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/lidwatchersettings.ui b/config/lidwatchersettings.ui index 623ecbe..d5e1647 100644 --- a/config/lidwatchersettings.ui +++ b/config/lidwatchersettings.ui @@ -125,7 +125,7 @@ padding-top: 30px; - On Ac + On AC diff --git a/debian/changelog b/debian/changelog index a764403..bce273d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-powermanagement (0.9.0+20151024-1) experimental; urgency=medium + + * Cherry-picking upstream version 0.9.0+20151024. + + -- Alf Gaida Sat, 24 Oct 2015 12:16:06 +0200 + lxqt-powermanagement (0.9.0+20150914-1) experimental; urgency=medium * Cherry-picking upstream version 0.9.0+20150914. diff --git a/src/batteryhelper.cpp b/src/batteryhelper.cpp index 2e514d8..5733871 100644 --- a/src/batteryhelper.cpp +++ b/src/batteryhelper.cpp @@ -77,7 +77,7 @@ QString BatteryHelper::typeToString(Solid::Battery::BatteryType type) switch (type) { case Solid::Battery::PdaBattery: - return tr("Personal Digital Assistent's battery"); + return tr("Personal Digital Assistant's battery"); case Solid::Battery::UpsBattery: return tr("Uninterruptible Power Supply's battery"); case Solid::Battery::PrimaryBattery: