Branch: master

3e5e8758 2014-06-08 04:47:23 Michele Calgaro
Rebranding: TDE Control Center --> Trinity Control Center
M README
M doc/glossary/tdeprintingglossary.docbook
M kcontrol/access/kaccess.cpp
M kcontrol/joystick/caldialog.cpp
M kcontrol/joystick/caldialog.h
M kcontrol/joystick/joydevice.cpp
M kcontrol/joystick/joydevice.h
M kcontrol/joystick/joystick.cpp
M kcontrol/joystick/joystick.h
M kcontrol/joystick/joywidget.cpp
M kcontrol/joystick/joywidget.h
M kcontrol/joystick/poswidget.cpp
M kcontrol/joystick/poswidget.h
M kcontrol/kcontrol/main.cpp
M kcontrol/kcontrol/tde-kcontrol.desktop
M kcontrol/keys/keyconfig.cpp
M kcontrol/knotify/README
M kcontrol/smartcard/nosmartcardbase.ui
M khelpcenter/view.cpp
M kmenuedit/kcontrol_main.cpp
M konqueror/konq_mainwindow.cc
M nsplugins/README
M tdm/README
diff --git a/README b/README
index 69ebefb..fb40fb1 100644
--- a/README
+++ b/README
@@ -42,7 +42,7 @@
     programs.
 
 * kcontrol
-    The TDE Control Center allows you to tweak the KDE settings.
+    The Trinity Control Center allows you to tweak the KDE settings.
 
 * kdcop
     GUI app to browse for DCOP interfaces, can also execute them.
diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook
index e51f53c..cec5857 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@@ -1149,7 +1149,7 @@
 				deprecated and no longer maintained. What was good in qtcups is all inherited
 				by "kprinter", the new TDE print dialog (which is much improved over qtcups);
 				what you liked about kups is now all in the TDEPrint Manager (accessible 
-				via the TDE Control Center or via the URL "print:/manager" from Konqueror) --
+				via the Trinity Control Center or via the URL "print:/manager" from Konqueror) --
 				with more functionality and less bugs... Its former developer, Michael Goffioul, is now
 				the developer of TDEPrint  -- mdash; a very nice and productive guy and quick bug fixer...
 				 </para>
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5a82068..5e50647 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -748,7 +748,7 @@
 
         createDialogContents();
         featuresLabel->setText ( question+"\n\n"+explanation
-              +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the TDE Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") );
+              +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") );
 
         KWin::setState( dialog->winId(), NET::KeepAbove );
         kapp->updateUserTimestamp();
diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp
index 877befb..69e0bef 100644
--- a/kcontrol/joystick/caldialog.cpp
+++ b/kcontrol/joystick/caldialog.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h
index 343666f..202296f 100644
--- a/kcontrol/joystick/caldialog.h
+++ b/kcontrol/joystick/caldialog.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/joydevice.cpp b/kcontrol/joystick/joydevice.cpp
index 3c4aeac..f6bf04e 100644
--- a/kcontrol/joystick/joydevice.cpp
+++ b/kcontrol/joystick/joydevice.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/joydevice.h b/kcontrol/joystick/joydevice.h
index d02d5de..7519bbf 100644
--- a/kcontrol/joystick/joydevice.h
+++ b/kcontrol/joystick/joydevice.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 69e81b7..d0521d8 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -70,7 +70,7 @@
   : TDECModule(JoystickFactory::instance(), parent, name)
 {
   setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
-                               I18N_NOOP("TDE Control Center Module to test Joysticks"),
+                               I18N_NOOP("Trinity Control Center Module to test Joysticks"),
                                TDEAboutData::License_GPL, "(c) 2004, Martin Koller",
                                0, "m.koller@..."));
 
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index eadccd0..8ef9e96 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index 67ea30e..5d10400 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h
index 5a33530..45291d2 100644
--- a/kcontrol/joystick/joywidget.h
+++ b/kcontrol/joystick/joywidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp
index 95fb5dd..af86090 100644
--- a/kcontrol/joystick/poswidget.cpp
+++ b/kcontrol/joystick/poswidget.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h
index 4dd565c..324ee1d 100644
--- a/kcontrol/joystick/poswidget.h
+++ b/kcontrol/joystick/poswidget.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2003 by Martin Koller                                   *
  *   m.koller@...                                                    *
- *   This file is part of the TDE Control Center Module for Joysticks      *
+ *   This file is part of the Trinity Control Center Module for Joysticks  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 2656359..25ab4fc 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -103,7 +103,7 @@
   TDELocale::setMainCatalogue("kcontrol");
   TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
     KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
-    I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
+    I18N_NOOP("(c) 1998-2004, The Trinity Control Center Developers"));
 
   TQCString argv_0 = argv[0];
   TDEAboutData *aboutData;
diff --git a/kcontrol/kcontrol/tde-kcontrol.desktop b/kcontrol/kcontrol/tde-kcontrol.desktop
index f27736e..c5e78af 100644
--- a/kcontrol/kcontrol/tde-kcontrol.desktop
+++ b/kcontrol/kcontrol/tde-kcontrol.desktop
@@ -5,7 +5,7 @@
 DocPath=kcontrol/index.html
 X-TDE-StartupNotify=true
 
-Name=TDE Control Center
+Name=Trinity Control Center
 Name[ca]=Centre de control del TDE
 Name[cs]=Ovl��dac�� centrum TDE
 Name[da]=TDE Kontrolcenter
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 9785d22..ee39447 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -137,7 +137,7 @@
   // That move will take a lot of UI redesigning, though, so i'll do it once CVS
   //  opens up for feature commits again. -- ellis
   /* Needed to remove because this depended upon non-BC changes in KeyEntry.*/
-  // If this is the "Global Keys" section of the TDE Control Center:
+  // If this is the "Global Keys" section of the Trinity Control Center:
   if( isGlobal && !bSeriesOnly ) {
 	preferMetaBt = new TQCheckBox( i18n("Prefer 4-modifier defaults"), this );
 	if( !KKeySequence::keyboardHasMetaKey() )
diff --git a/kcontrol/knotify/README b/kcontrol/knotify/README
index 712b78d..0ebfea8 100644
--- a/kcontrol/knotify/README
+++ b/kcontrol/knotify/README
@@ -1,2 +1,2 @@
-This is a TDE Control Center Module for configuring system notifications 
+This is a Trinity Control Center Module for configuring system notifications 
 
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index ceaec9e..3b32d63 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -44,7 +44,7 @@
                     </property>
                     <property name="text">
                         <string>
-1) The TDE daemon, 'kded' is not running. You can restart it by running the command 'tdeinit' and then try reloading the TDE Control Center to see if this message goes away.
+1) The TDE daemon, 'kded' is not running. You can restart it by running the command 'tdeinit' and then try reloading the Trinity Control Center to see if this message goes away.
 
 2) You don't appear to have smartcard support in the TDE libraries. You will need to recompile the tdelibs package with libpcsclite installed.</string>
                     </property>
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index f0151b3..ea296b0 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -135,7 +135,7 @@
           .arg( i18n( "Frequently Asked Questions" ) )
           .arg( i18n( "Basic Applications" ) )
           .arg( i18n( "The Kicker Desktop Panel" ) )
-          .arg( i18n( "The TDE Control Center" ) )
+          .arg( i18n( "The Trinity Control Center" ) )
           .arg( i18n( "The Konqueror File manager and Web Browser" ) )
           .arg( langLookup( "khelpcenter/kdelogo2.png" ) );
 ** Diff limit reached (max: 250 lines) **