diff --git a/doc/kcontrol/colors/index.docbook b/doc/kcontrol/colors/index.docbook
--- a/doc/kcontrol/colors/index.docbook
+++ b/doc/kcontrol/colors/index.docbook
@@ -14,8 +14,8 @@
-2016-09-20
-Plasma 5.8
+2017-11-07
+Plasma 5.11
KDE
@@ -80,16 +80,16 @@
assigning colors.
- Apply inactive window color effects
+ Apply effects to inactive windows
— If checked, state effects (see below) will be applied to inactive
windows. This can help visually identify active versus inactive windows,
and may have aesthetic value, depending on your taste. However, some
users feel that it causes distracting "flickering" since
windows must be repainted when they become inactive. Unlike desktop
effects, color state effects do not require compositing support and will
work on all systems, however they will only work on &kde; applications.
- Inactive selection changes color
+ Use different colors for inactive selections
— If checked, the current selection in elements which do not have
input focus will be drawn using a different color. This can assist visual
identification of the element with input focus in some applications,
diff --git a/doc/kcontrol/icons/index.docbook b/doc/kcontrol/icons/index.docbook
--- a/doc/kcontrol/icons/index.docbook
+++ b/doc/kcontrol/icons/index.docbook
@@ -15,8 +15,8 @@
-2016-09-21
-Plasma 5.8
+2017-11-07
+Plasma 5.11
KDE
@@ -221,7 +221,7 @@
You can also choose animated icons. Many of the icons have
animations associated with them. Enable the checkbox labelled
-Animate Icons, to enable this effect, but note
+Enable icon animations, to enable this effect, but note
that it may appear slow or jerky if your graphics card is old or you
are low on memory.
diff --git a/doc/kcontrol/kcmstyle/index.docbook b/doc/kcontrol/kcmstyle/index.docbook
--- a/doc/kcontrol/kcmstyle/index.docbook
+++ b/doc/kcontrol/kcmstyle/index.docbook
@@ -14,8 +14,8 @@
-2017-04-01
-Plasma 5.9
+2017-11-07
+Plasma 5.11
KDE
@@ -73,12 +73,12 @@
-Show icons on buttons
+Show icons in buttons
If this option is selected, action buttons (like OK and
Apply) will have a small icon located within them to act
as a visual reference. If this option is not selected, then only text
-will appear on the button.
+will appear in the button.
@@ -93,7 +93,7 @@
-Main toolbar text, Secondary toolbar text
+Main toolbar text location, Secondary toolbar text location
These drop down boxes lets you determine where on the button in both toolbars the
text name of the button will appear as the default.
diff --git a/kcms/colors/scmeditoroptions.ui b/kcms/colors/scmeditoroptions.ui
--- a/kcms/colors/scmeditoroptions.ui
+++ b/kcms/colors/scmeditoroptions.ui
@@ -14,14 +14,14 @@
-
- Apply inactive window color &effects
+ Apply &effects to inactive windows
-
- In&active selection changes color
+ Use different colors for in&active selections
diff --git a/kcms/icons/icons.cpp b/kcms/icons/icons.cpp
--- a/kcms/icons/icons.cpp
+++ b/kcms/icons/icons.cpp
@@ -99,7 +99,7 @@
lbl->setBuddy(mpSizeBox);
grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft);
- mpAnimatedCheck = new QCheckBox(i18n("Animate icons"), m_pTab1);
+ mpAnimatedCheck = new QCheckBox(i18n("Enable icon animations"), m_pTab1);
connect(mpAnimatedCheck, &QCheckBox::toggled, this, &KIconConfig::slotAnimatedCheck);
grid->addWidget(mpAnimatedCheck, 2, 0, 1, 2, Qt::AlignLeft);
grid->setRowStretch(3, 10);
diff --git a/kcms/style/finetuning.ui b/kcms/style/finetuning.ui
--- a/kcms/style/finetuning.ui
+++ b/kcms/style/finetuning.ui
@@ -41,7 +41,7 @@
-
- Show icons on buttons:
+ Show icons in buttons:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -60,7 +60,7 @@
-
- Main toolbar text:
+ Main toolbar text location:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -97,7 +97,7 @@
-
- Secondary toolbar text:
+ Secondary toolbar text location:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
diff --git a/kcms/workspaceoptions/mainpage.ui b/kcms/workspaceoptions/mainpage.ui
--- a/kcms/workspaceoptions/mainpage.ui
+++ b/kcms/workspaceoptions/mainpage.ui
@@ -17,7 +17,7 @@
-
- Show Informational Tips
+ Display informational tooltips on mouse hover
true
@@ -40,7 +40,7 @@
-
- Visual feedback for status changes
+ Display visual feedback for status changes