kcmkeys: update keyboard shortcut schemes

- Add actions related to keys XF86Sleep (Suspend) and XF86ScreenSaver (Lock Session)
- Fix name of "Log Out" actions

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
(cherry picked from commit e0069f90483ba30d28dd76ee3e0c82d7b94bc00b)

6 files changed, 24 insertions, 12 deletions

diff --git a/kcontrol/keys/kde4.kksrc b/kcontrol/keys/kde4.kksrc
index 367bc41d6..a35eaafbd 100644
--- a/kcontrol/keys/kde4.kksrc
+++ b/kcontrol/keys/kde4.kksrc
@@ -75,8 +75,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Win+Ctrl+Delete
 Lock Session=Win+ScrollLock
-Logout=Win+Escape
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Win+Escape
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Win+Ctrl+R
 Mouse Emulation=none
 Popup Launch Menu=Win+Menu
@@ -85,6 +86,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=Win+Ctrl+V
 Show Taskmanager=Win+Ctrl+Pause
 Show Window List=Win+0
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/trinity.kksrc b/kcontrol/keys/trinity.kksrc
index 57681b60f..2339b9186 100644
--- a/kcontrol/keys/trinity.kksrc
+++ b/kcontrol/keys/trinity.kksrc
@@ -75,8 +75,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Alt+Ctrl+Escape
 Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
 Mouse Emulation=Alt+F12
 Popup Launch Menu=Alt+F1
@@ -86,6 +87,7 @@ Show Klipper Popup-Menu=Alt+Ctrl+V
 Show Taskmanager=Ctrl+Escape
 Show Window List=Alt+F5
 Start Screen Saver=Alt+Ctrl+S
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/unix3.kksrc b/kcontrol/keys/unix3.kksrc
index 8ac722ec6..de091abc7 100644
--- a/kcontrol/keys/unix3.kksrc
+++ b/kcontrol/keys/unix3.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Alt+F9
 Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
 Mouse Emulation=Alt+F12
 Popup Launch Menu=Alt+F1
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=none
 Show Taskmanager=Ctrl+Escape
 Show Window List=none
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/win3.kksrc b/kcontrol/keys/win3.kksrc
index 926f83670..a7ae3adbc 100644
--- a/kcontrol/keys/win3.kksrc
+++ b/kcontrol/keys/win3.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=none
 Lock Session=none
-Logout=none
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=none
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=none
 Mouse Emulation=none
 Popup Launch Menu=Ctrl+Escape
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=none
 Show Taskmanager=Alt+Ctrl+Delete
 Show Window List=none
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/win4.kksrc b/kcontrol/keys/win4.kksrc
index 1abb69313..3c53ecd25 100644
--- a/kcontrol/keys/win4.kksrc
+++ b/kcontrol/keys/win4.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=none
 Lock Session=none
-Logout=none
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=none
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=none
 Mouse Emulation=none
 Popup Launch Menu=Ctrl+Escape
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=none
 Show Taskmanager=Alt+Ctrl+Delete
 Show Window List=none
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/wm3.kksrc b/kcontrol/keys/wm3.kksrc
index 6c6ef61e5..70abfbf94 100644
--- a/kcontrol/keys/wm3.kksrc
+++ b/kcontrol/keys/wm3.kksrc
@@ -71,8 +71,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Alt+Ctrl+Escape
 Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
 Mouse Emulation=Alt+F12
 Popup Launch Menu=Alt+F1
@@ -81,6 +82,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=Alt+Ctrl+V
 Show Taskmanager=Ctrl+Escape
 Show Window List=Alt+F5
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none