From 1246e0a69ee389910f7aa31b66dc04e177262eb4 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 6 Oct 2011 21:30:51 +0000
Subject: Force any ICC settings to override gamma sliders Fix application of
 ICC settings from displayconfig module Disallow dragging of primary monitor
 in displayconfig module

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1257648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/displayconfig/displayconfigbase.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kcontrol/displayconfig/displayconfigbase.ui')

diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui
index a71dca758..161fb81ff 100644
--- a/kcontrol/displayconfig/displayconfigbase.ui
+++ b/kcontrol/displayconfig/displayconfigbase.ui
@@ -584,7 +584,7 @@
 								    <cstring>gammaTipText2</cstring>
 							    </property>
 							    <property name="text">
-								    <string>Tip: Most computer software expects a gamma of 2.2.</string>
+								    <string>Tip: Most computer software expects a gamma of 2.2.\nAdditionally, any ICC settings for the selected screen will override the gamma controls available on this tab.</string>
 							    </property>
 						    </widget>
 						    <spacer row="4" column="0">
-- 
cgit v1.2.1