diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -55,9 +55,9 @@
{
setupUi(this);
layout()->setContentsMargins(0, 0, 0, 0);
- kcfg_Timeout->setSuffix(ki18ncp("Spinbox suffix. Short for minutes"," min"," mins"));
+ kcfg_Timeout->setSuffix(ki18ncp("Spinbox suffix"," minute"," minutes"));
- kcfg_LockGrace->setSuffix(ki18ncp("Spinbox suffix. Short for seconds"," sec"," secs"));
+ kcfg_LockGrace->setSuffix(ki18ncp("Spinbox suffix"," second"," seconds"));
}
diff --git a/kcm/kcm.ui b/kcm/kcm.ui
--- a/kcm/kcm.ui
+++ b/kcm/kcm.ui
@@ -4,18 +4,10 @@
- 0
- 0
- 577
- 544
+ 500
+ 525
-
-
- 0
- 0
-
-
-
@@ -25,115 +17,91 @@
true
-
-
-
- 0
- 0
-
-
+
Activation
-
-
-
-
-
-
+
+
+ Qt::AlignHCenter|Qt::AlignTop
+
+
-
+
+
+ Lock screen:
+
+
+
+ -
+
+
+ 0
+
+
-
-
-
- 0
- 0
-
-
- Lock screen automatically after:
+ Automatically after:
- -
+
-
-
-
- 0
- 0
-
-
1
- -
-
-
- Re&quire password after locking:
-
-
- kcfg_LockGrace
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Immediately
-
-
- 300
-
-
- 10
-
-
-
- -
-
-
- Lock screen when waking up from suspension
-
-
- &Lock screen on resume:
-
-
- kcfg_LockOnResume
-
-
-
- -
-
-
- Lock screen when waking up from suspension
-
-
-
-
-
-
- -
-
-
- -
-
-
- The global keyboard shortcut to lock the screen.
-
-
- Keyboard shortcut:
-
-
-
+ -
+
+
+ Lock screen when waking up from suspension
+
+
+ On resume
+
+
+
+ -
+
+
+ Allow unlocking without password for:
+
+
+ kcfg_LockGrace
+
+
+
+ -
+
+
+ Immediately
+
+
+ 300
+
+
+ 10
+
+
+
+ -
+
+
+ The global keyboard shortcut to lock the screen.
+
+
+ Keyboard shortcut:
+
+
+
+ -
+
+
@@ -161,19 +129,19 @@
-
-
+
-
-
+
QFormLayout::FieldsStayAtSizeHint
Qt::AlignHCenter|Qt::AlignTop
-
-
+
- Wallpaper &Type:
+ Wallpaper &type:
wallpaperCombo
@@ -207,6 +175,11 @@
+
+ QQuickWidget
+ QWidget
+ QtQuickWidgets/QQuickWidget
+
KKeySequenceWidget
QWidget
@@ -217,12 +190,14 @@
QSpinBox
-
- QQuickWidget
- QWidget
- QtQuickWidgets/QQuickWidget
-
-
+
+
+ kcfg_Autolock
+ toggled(bool)
+ kcfg_Timeout
+ setEnabled(bool)
+
+
diff --git a/kcm/screenlocker.desktop b/kcm/screenlocker.desktop
--- a/kcm/screenlocker.desktop
+++ b/kcm/screenlocker.desktop
@@ -51,7 +51,7 @@
Name[x-test]=xxScreen Lockingxx
Name[zh_CN]=锁屏
Name[zh_TW]=螢幕鎖定
-Comment=Configure Screen Locking
+Comment=Configure screen locking
Comment[ca]=Configura el bloqueig de la pantalla
Comment[ca@valencia]=Configura el bloqueig de la pantalla
Comment[cs]=Nastavit uzamykání obrazovky