Commit 7ba43d47 authored by Nate Graham's avatar Nate Graham 🔩

[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
parent 972eb26d
......@@ -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);
......
......@@ -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);
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"),
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment