Git commit 7ba43d4767f6e4e4ed707d97dbdf324392e472a6 by Nate Graham.
Committed on 27/02/2019 at 15:13.
Pushed by ngraham into branch 'master'.
[KCM & UI] Use the word "Sleep" instead of "Suspend"
Summary:
[copy-pasted from T10500:]
Problems with the current term:
- It's a somewhat severe-sounding technical term that doesn't intrinsically
mean much to the average person. To the extent that it does, the connotations
may be negative (e.g. when a misbehaving kid is being kept out of school)
- Our two major closed-source desktop competitors (macOS and Windows) both use
the term "Sleep", so user familiarity with "Suspend" is low and falling all the
time
I'd like to propose that we use "Sleep" instead, to address the above issues.
It's a nicer
word in general, and since it's what our competitors use, we benefit from user
familiarity.
We also recently adopted a moon icon with Zs for this, which visually connotes
sleep. So it
would make sense to update the string too, because then the string and the icon
will both
match.
Test Plan:
Energy Saving KCM: {F6626041}
Advanced [Energy] Settings KCM: {F6626043}
Reviewers: #vdg, #plasma, broulik, filipf, mart
Reviewed By: #vdg, #plasma, filipf, mart
Subscribers: filipf, mart, ltoscano, abetts, aacid, plasma-devel,
kde-doc-english
Tags: #plasma, #documentation
Maniphest Tasks: T10500
Differential Revision: https://phabricator.kde.org/D19186
M +2 -2 daemon/actions/bundled/handlebuttoneventsconfig.cpp
M +1 -1 daemon/actions/bundled/suspendsessionconfig.cpp
M +2 -2 doc/kcm/index.docbook
M +1 -1 kcmodule/activities/activityWidget.ui
M +1 -1 kcmodule/activities/activitywidget.cpp
M +1 -1 kcmodule/global/GeneralPage.cpp
https://commits.kde.org/powerdevil/7ba43d4767f6e4e4ed707d97dbdf324392e472a6
diff --git a/daemon/actions/bundled/handlebuttoneventsconfig.cpp
b/daemon/actions/bundled/handlebuttoneventsconfig.cpp
index 08368b8..ed8cebb 100644
--- a/daemon/actions/bundled/handlebuttoneventsconfig.cpp
+++ b/daemon/actions/bundled/handlebuttoneventsconfig.cpp
@@ -96,13 +96,13 @@ QList< QPair< QString, QWidget* > >
HandleButtonEventsConfig::buildUi()
Q_FOREACH (QComboBox *box, boxes) {
box->addItem(QIcon::fromTheme("dialog-cancel"), i18n("Do
nothing"), (uint)SuspendSession::None);
if (PowerManagement::instance()->canSuspend()) {
- box->addItem(QIcon::fromTheme("system-suspend"),
i18n("Suspend"), (uint)SuspendSession::ToRamMode);
+ box->addItem(QIcon::fromTheme("system-suspend"),
i18nc("Suspend to RAM", "Sleep"), (uint)SuspendSession::ToRamMode);
}
if (PowerManagement::instance()->canHibernate()) {
box->addItem(QIcon::fromTheme("system-suspend-hibernate"),
i18n("Hibernate"), (uint)SuspendSession::ToDiskMode);
}
if (PowerManagement::instance()->canHybridSuspend()) {
- box->addItem(QIcon::fromTheme("system-suspend-hybrid"),
i18n("Hybrid suspend"), (uint)SuspendSession::SuspendHybridMode);
+ box->addItem(QIcon::fromTheme("system-suspend-hybrid"),
i18n("Hybrid sleep"), (uint)SuspendSession::SuspendHybridMode);
}
box->addItem(QIcon::fromTheme("system-shutdown"), i18n("Shut
down"), (uint)SuspendSession::ShutdownMode);
box->addItem(QIcon::fromTheme("system-lock-screen"), i18n("Lock
screen"), (uint)SuspendSession::LockScreenMode);
diff --git a/daemon/actions/bundled/suspendsessionconfig.cpp
b/daemon/actions/bundled/suspendsessionconfig.cpp
index e2f540e..024dff4 100644
--- a/daemon/actions/bundled/suspendsessionconfig.cpp
+++ b/daemon/actions/bundled/suspendsessionconfig.cpp
@@ -79,7 +79,7 @@ QList< QPair< QString, QWidget* > >
SuspendSessionConfig::buildUi()
m_idleTime->setSuffix(i18n(" min"));
if (PowerManagement::instance()->canSuspend()) {
- m_comboBox->addItem(QIcon::fromTheme("system-suspend"),
i18n("Suspend"), (uint)SuspendSession::ToRamMode);
+ m_comboBox->addItem(QIcon::fromTheme("system-suspend"), i18nc("Suspend
to RAM", "Sleep"), (uint)SuspendSession::ToRamMode);
}
if (PowerManagement::instance()->canHibernate()) {
m_comboBox->addItem(QIcon::fromTheme("system-suspend-hibernate"),
i18n("Hibernate"), (uint)SuspendSession::ToDiskMode);
diff --git a/doc/kcm/index.docbook b/doc/kcm/index.docbook
index f9815b4..157efe3 100644
--- a/doc/kcm/index.docbook
+++ b/doc/kcm/index.docbook
@@ -86,7 +86,7 @@ brightness 0, in the amount of time you specify in the spin
box.
<varlistentry><term><guilabel>Suspend session</guilabel></term>
<listitem>
<para>Suspends the session after the selected time to the status
-<guilabel>Suspend</guilabel>, <guilabel>Hibernate</guilabel>,
+<guilabel>Sleep</guilabel>, <guilabel>Hibernate</guilabel>,
<guilabel>Shutdown</guilabel> or <guilabel>Lock screen</guilabel>.</para>
</listitem>
</varlistentry>
@@ -149,7 +149,7 @@ Use the settings defined on <guilabel>Energy
Saving</guilabel> page.
<term>Define a special behavior</term>
<listitem>
<para>
-If this option is chosen, a special behavior for activity can be chosen. If
this is a presentation activity, you can check the <guilabel>Never shutdown the
screen</guilabel> and <guilabel>Never suspend or shutdown the
computer</guilabel> boxes. It is also possible to define the time interval for
the computer to switch to a suspension mode for the power saving activities.
+If this option is chosen, a special behavior for activity can be chosen. If
this is a presentation activity, you can check the <guilabel>Never shutdown the
screen</guilabel> and <guilabel>Never shutdown the computer or let it go to
sleep</guilabel> boxes. It is also possible to define the time interval for the
computer to switch to a suspension mode for the power saving activities.
</para>
</listitem>
</varlistentry>
diff --git a/kcmodule/activities/activityWidget.ui
b/kcmodule/activities/activityWidget.ui
index e17aaeb..7ab376b 100644
--- a/kcmodule/activities/activityWidget.ui
+++ b/kcmodule/activities/activityWidget.ui
@@ -76,7 +76,7 @@
<item>
<widget class="QCheckBox" name="noShutdownPCBox">
<property name="text">
- <string>Never suspend or shutdown the computer</string>
+ <string>Never shutdown the computer or let it go to sleep</string>
</property>
</widget>
</item>
diff --git a/kcmodule/activities/activitywidget.cpp
b/kcmodule/activities/activitywidget.cpp
index 43c0b14..64d4a37 100644
--- a/kcmodule/activities/activitywidget.cpp
+++ b/kcmodule/activities/activitywidget.cpp
@@ -94,7 +94,7 @@ void ActivityWidget::load()
if (PowerDevil::PowerManagement::instance()->canSuspend()) {
m_ui->alwaysActionBox->addItem(QIcon::fromTheme("system-suspend"),
- i18n("Suspend"),
(uint)SuspendSession::ToRamMode);
+ i18nc("Suspend to RAM", "Sleep"),
(uint)SuspendSession::ToRamMode);
}
if (PowerDevil::PowerManagement::instance()->canHibernate()) {
m_ui->alwaysActionBox->addItem(QIcon::fromTheme("system-suspend-hibernate"),
diff --git a/kcmodule/global/GeneralPage.cpp b/kcmodule/global/GeneralPage.cpp
index c699b92..858441d 100644
--- a/kcmodule/global/GeneralPage.cpp
+++ b/kcmodule/global/GeneralPage.cpp
@@ -104,7 +104,7 @@ void GeneralPage::fillUi()
BatteryCriticalCombo->addItem(QIcon::fromTheme("dialog-cancel"), i18n("Do
nothing"), PowerDevil::BundledActions::SuspendSession::None);
if (PowerDevil::PowerManagement::instance()->canSuspend()) {
- BatteryCriticalCombo->addItem(QIcon::fromTheme("system-suspend"),
i18n("Suspend"), PowerDevil::BundledActions::SuspendSession::ToRamMode);
+ BatteryCriticalCombo->addItem(QIcon::fromTheme("system-suspend"),
i18nc("Suspend to RAM", "Sleep"),
PowerDevil::BundledActions::SuspendSession::ToRamMode);
}
if (PowerDevil::PowerManagement::instance()->canHibernate()) {
BatteryCriticalCombo->addItem(QIcon::fromTheme("system-suspend-hibernate"),
i18n("Hibernate"), PowerDevil::BundledActions::SuspendSession::ToDiskMode);
