Streamline Color Profile module with the rest.

Signed-off-by: Chris <[email protected]>
(cherry picked from commit c06244f4f15839567a7de0c341ad50602cfaabef)

3 files changed, 23 insertions, 27 deletions

diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 2cf0a58f4..2ca108e3f 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -74,9 +74,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
 
   TDEAboutData *about =
-  new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"),
+  new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE Color Profile Control Module"),
                 0, 0, TDEAboutData::License_GPL,
-                I18N_NOOP("(c) 2009,2010 Timothy Pearson"));
+                I18N_NOOP("(c) 2009, 2010 Timothy Pearson\n(c) 2019 The Trinity Desktop Project"));
 
   about->addAuthor("Timothy Pearson", 0, "[email protected]");
   setAboutData( about );
@@ -84,7 +84,7 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   base = new ICCConfigBase(this);
   layout->add(base);
 
-  setRootOnlyMsg(i18n("<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."));
+  setRootOnlyMsg(i18n("<b>The global color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global profile, click on the \"Administrator Mode\" button below."));
 //   setUseRootOnlyMsg(true);	// Setting this hides the Apply button!
 
   connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
@@ -165,7 +165,7 @@ void KICCConfig::renameProfile () {
 	TQString _error;
 
 	while (!_end) {
-		_new = KInputDialog::getText( i18n("ICC Profile Configuration"),  _error + _text, TQString::null, &_ok, this);
+		_new = KInputDialog::getText( i18n("Color Profile Configuration"),  _error + _text, TQString::null, &_ok, this);
 		if (!_ok ) {
 			_end = true;
 		} else {
@@ -200,7 +200,7 @@ void KICCConfig::addProfile () {
 	TQString _error;
 
 	while (!_end) {
-		_new = KInputDialog::getText( i18n("ICC Profile Configuration"),  _error + _text, TQString::null, &_ok, this);
+		_new = KInputDialog::getText( i18n("Color Profile Configuration"),  _error + _text, TQString::null, &_ok, this);
 		if (!_ok ) {
 			_end = true;
 		} else {
@@ -416,7 +416,7 @@ void KICCConfig::save()
 		errorstr = randrsimple->clearIccConfiguration();
 	}
 	if (errorstr != "") {
-		KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n%1").arg(errorstr));
+		KMessageBox::error(this, TQString("Unable to apply color profile configuration:\n%1").arg(errorstr));
 	}
 
 	emit changed(false);
@@ -429,8 +429,8 @@ void KICCConfig::defaults()
 
 TQString KICCConfig::quickHelp() const
 {
-  return i18n("<h1>ICC Profile Configuration</h1> This module allows you to configure TDE support"
-     " for ICC profiles. This allows you to easily color correct your monitor"
+  return i18n("<h1>Color Profile Configuration</h1> This module allows you to configure TDE support"
+     " for ICC color profiles. This allows you to easily color correct your monitor"
      " for a more lifelike and vibrant image.");
 }
 
diff --git a/kcontrol/iccconfig/iccconfig.desktop b/kcontrol/iccconfig/iccconfig.desktop
index eaa486c88..0f36f48fc 100644
--- a/kcontrol/iccconfig/iccconfig.desktop
+++ b/kcontrol/iccconfig/iccconfig.desktop
@@ -11,27 +11,23 @@ X-TDE-RootOnly=true
 X-TDE-SubstituteUID=true
 
 Categories=Qt;TDE;X-TDE-settings-hardware;
-Comment=Configure display ICC profile
-Comment[en_US]=Configure display ICC profile
-Comment[de]=ICC-Profile der Anzeige einrichten
-Comment[fr]=Configurer les profils de couleurs ICC
+Comment=Configure display ICC color profile
+Comment[de]=ICC-Farbprofil der Anzeige einrichten
+Comment[fr]=Configurer le profil ICC des couleurs
 Comment[it]=Configurazione del profilo ICC del display
 Comment[ru]=Конфигурация профиля ICC экрана
 Comment[uk]=Конфігурація профілю ICC екрану
 
-GenericName=
-GenericName[en_US]=
-
 Keywords=ICC;display;color;profile;
 Keywords[de]=ICC;Anzeige;Farbe;Profil;
+Keywords[fr]=ICC;affichage;couleurs;profil;
 Keywords[it]=ICC;Display;Colori;Profilo;
 
-Name=ICC Color Profile
-Name[en_US]=ICC Color Profile
-Name[de]=ICC-Farbprofile
-Name[fr]=Profils de couleurs ICC
-Name[it]=Profilo dei colori ICC
-Name[ru]=ICC Профиль цвета
-Name[uk]=ICC Профіль кольору
+Name=Color Profile
+Name[de]=Farbprofil
+Name[fr]=Profil de couleurs
+Name[it]=Profilo dei colori
+Name[ru]=Профиль цвета
+Name[uk]=Профіль кольору
 
 NoDisplay=false
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 980c62c01..3660c0d60 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -20,7 +20,7 @@
                     <cstring>tab</cstring>
                 </property>
                 <attribute name="title">
-                    <string>ICC Color Profile Configuration</string>
+                    <string>Color Profile Configuration</string>
                 </attribute>
                 <grid>
                     <property name="name">
@@ -42,7 +42,7 @@
 						<cstring>systemEnableSupport</cstring>
 					</property>
 					<property name="text">
-						<string>&amp;Enable global ICC color profile support</string>
+						<string>&amp;Enable global color profile support</string>
 					</property>
                     		</widget>
 				<widget class="KURLRequester" row="1" column="1" colspan="4">
@@ -58,7 +58,7 @@
 						<cstring>textLabel4_2</cstring>
 					</property>
 					<property name="text">
-						<string>ICC File</string>
+						<string>Color Profile</string>
 					</property>
 				</widget>
 			    </grid>
@@ -79,7 +79,7 @@
 						<cstring>enableSupport</cstring>
 					</property>
 					<property name="text">
-						<string>&amp;Enable user ICC color profile support</string>
+						<string>&amp;Enable user color profile support</string>
 					</property>
                     		</widget>
 				<widget class="KComboBox" row="1" column="1">
@@ -145,7 +145,7 @@
 						<cstring>textLabel2_2</cstring>
 					</property>
 					<property name="text">
-						<string>ICC File</string>
+						<string>Color Profile</string>
 					</property>
 				</widget>
 			    </grid>