Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit b83e5ecc authored by Nate Graham's avatar Nate Graham 🔩

Replace "Shutdown" with "Shut Down" in user-facing strings

Summary:
"Shutdown" is a noun ("The nuclear reactor is experiencing a shutdown!")

"Shut Down" is an imperative command with a verb ("Shut down the nuclear reactor!"), which is how everything else is phrased.

Test Plan:
- Login screen button now says "Shut Down"
- Searching for "shut down" in KRunner brings up the appropriate option ("shutdown" still works too)
- KRunner says, "Shut down the computer"

Reviewers: #vdg, #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: davidedmundson, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D15878
parent c0109051
......@@ -226,7 +226,7 @@ void KSMServer::shutdown( KWorkSpace::ShutdownConfirm confirm,
switch (sdtype) {
case KWorkSpace::ShutdownTypeHalt:
//i18nd is used as this patch was backported to an LTS with stable translations
fallbackPrompt->setText(i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Shutdown"));
fallbackPrompt->setText(i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Shut Down"));
break;
case KWorkSpace::ShutdownTypeReboot:
fallbackPrompt->setText(i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Reboot"));
......
......@@ -188,7 +188,7 @@ PlasmaCore.ColorScope {
LogoutButton {
id: shutdownButton
iconSource: "system-shutdown"
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Shutdown")
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Shut Down")
action: root.haltRequested
KeyNavigation.left: rebootButton
KeyNavigation.right: logoutButton
......
......@@ -42,7 +42,7 @@ SessionRunner::SessionRunner(QObject *parent, const QVariantList &args)
if (m_canLogout) {
addSyntax(Plasma::RunnerSyntax(i18nc("log out command", "logout"),
i18n("Logs out, exiting the current desktop session")));
addSyntax(Plasma::RunnerSyntax(i18nc("shutdown computer command", "shutdown"),
addSyntax(Plasma::RunnerSyntax(i18nc("shut down computer command", "shut down"),
i18n("Turns off the computer")));
}
......@@ -98,9 +98,10 @@ void SessionRunner::matchCommands(QList<Plasma::QueryMatch> &matches, const QStr
match.setType(Plasma::QueryMatch::ExactMatch);
match.setRelevance(0.9);
matches << match;
} else if (term.compare(i18nc("shutdown computer command","shutdown"), Qt::CaseInsensitive) == 0) {
} else if (term.compare(i18nc("shut down computer command","shut down"), Qt::CaseInsensitive) == 0 ||
term.compare(i18nc("shut down computer command", "shutdown"), Qt::CaseInsensitive) == 0) {
Plasma::QueryMatch match(this);
match.setText(i18n("Shutdown the computer"));
match.setText(i18n("Shut down the computer"));
match.setIconName(QStringLiteral("system-shutdown"));
match.setData(ShutdownAction);
match.setType(Plasma::QueryMatch::ExactMatch);
......
......@@ -202,7 +202,7 @@ PlasmaCore.ColorScope {
},
ActionButton {
iconSource: "system-shutdown"
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Shutdown")
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Shut Down")
onClicked: sddm.powerOff()
enabled: sddm.canPowerOff
visible: !inputPanel.keyboardActive
......
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