From d8a7443605bddd17d2a3d090c169630ebb1539c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@gmail.com>
Date: Sat, 2 Mar 2019 06:33:02 +0100
Subject: [PATCH] [Logout screen] Change labels to match SDDM theme labels

Summary:
This patch changes the logout screen labels to match the labels in the SDDM theme.

Reboot --> Restart
Logout --> Log Out (Title Capitalization)

It also adjusts the corresponding messages that use the verbs.

Reviewers: #vdg, ngraham

Reviewed By: #vdg, ngraham

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D19458
---
 applets/lock_logout/contents/ui/data.js |  2 +-
 lookandfeel/contents/logout/Logout.qml  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applets/lock_logout/contents/ui/data.js b/applets/lock_logout/contents/ui/data.js
index 6ccca7f55..76ad96ef3 100644
--- a/applets/lock_logout/contents/ui/data.js
+++ b/applets/lock_logout/contents/ui/data.js
@@ -13,7 +13,7 @@ var data = [{
     icon: "system-shutdown",
     operation: "requestShutDown",
     tooltip_mainText: i18n("Leave..."),
-    tooltip_subText: i18n("Logout, turn off or restart the computer")
+    tooltip_subText: i18n("Log out, turn off or restart the computer")
 }, {
     icon: "system-suspend",
     operation: "suspendToRam",
diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
index 97a6a8cd2..ee28fd4b2 100644
--- a/lookandfeel/contents/logout/Logout.qml
+++ b/lookandfeel/contents/logout/Logout.qml
@@ -149,8 +149,8 @@ PlasmaCore.ColorScope {
             wrapMode: Text.WordWrap
             font.italic: true
             text: i18ndp("plasma_lookandfeel_org.kde.lookandfeel",
-                         "One other user is currently logged in. If the computer is shut down or rebooted, that user may lose work.",
-                         "%1 other users are currently logged in. If the computer is shut down or rebooted, those users may lose work.",
+                         "One other user is currently logged in. If the computer is shut down or restarted, that user may lose work.",
+                         "%1 other users are currently logged in. If the computer is shut down or restarted, those users may lose work.",
                          sessionsModel.count)
             visible: sessionsModel.count > 1
         }
@@ -179,7 +179,7 @@ PlasmaCore.ColorScope {
             LogoutButton {
                 id: rebootButton
                 iconSource: "system-reboot"
-                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Reboot")
+                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Restart")
                 action: root.rebootRequested
                 KeyNavigation.left: hibernateButton
                 KeyNavigation.right: shutdownButton
@@ -199,7 +199,7 @@ PlasmaCore.ColorScope {
             LogoutButton {
                 id: logoutButton
                 iconSource: "system-log-out"
-                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Logout")
+                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log Out")
                 action: root.logoutRequested
                 KeyNavigation.left: shutdownButton
                 KeyNavigation.right: suspendButton
@@ -222,7 +222,7 @@ PlasmaCore.ColorScope {
             text: {
                 switch (sdtype) {
                     case ShutdownType.ShutdownTypeReboot:
-                        return i18ndp("plasma_lookandfeel_org.kde.lookandfeel", "Reboot in 1 second", "Reboot in %1 seconds", root.remainingTime);
+                        return i18ndp("plasma_lookandfeel_org.kde.lookandfeel", "Restarting in 1 second", "Restarting in %1 seconds", root.remainingTime);
                     case ShutdownType.ShutdownTypeHalt:
                         return i18ndp("plasma_lookandfeel_org.kde.lookandfeel", "Shutting down in 1 second", "Shutting down in %1 seconds", root.remainingTime);
                     default: