Rebranding, tooltip, and What's This string cleanup.

7 files changed, 11 insertions, 12 deletions

diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index 425d58823..f6fcd2e5a 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -56,8 +56,8 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	about->addAuthor("Daniel Molkentin",0,"[email protected]");
 	setAboutData( about );
 
-	setQuickHelp( i18n("<h1>Service Manager</h1><p>This module allows you to have an overview of all plugins of the "
-			"KDE Daemon (KDED), also referred to as TDE Services. Generally, there are two types of service:</p>"
+	setQuickHelp( i18n("<h1>Service Manager</h1><p>This module allows you to have an overview of all plugins "
+			"running as TDE Services. Generally, there are two types of service:</p>"
 			"<ul><li>Services invoked at startup</li><li>Services called on demand</li></ul>"
 			"<p>The latter are only listed for convenience. The startup services can be started and stopped. "
 			"In Administrator mode, you can also define whether services should be loaded at startup.</p>"
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index d38524e61..9409023c1 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -37,8 +37,8 @@ PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *na
   connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )),
       TQT_SLOT(slotTextChanged( const TQString &)));
 
-  TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.kde.org) "
-                                  "or a domain, starting with a dot (like .kde.org or .org)") );
+  TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.trinitydesktop.org) "
+                                  "or a domain, starting with a dot (like .trinitydesktop.org or .org)") );
 
   l_feature_policy = new TQLabel(main);
   grid->addWidget(l_feature_policy, 1, 0);
diff --git a/kcontrol/tdeio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui
index e2edb2d27..9ab0cb3b5 100644
--- a/kcontrol/tdeio/kproxydlg_ui.ui
+++ b/kcontrol/tdeio/kproxydlg_ui.ui
@@ -79,7 +79,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to
                         <string>&lt;qt&gt;
 Automatically detect and configure the proxy settings.&lt;p&gt;
 Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Protocol (WPAD)&lt;/b&gt;.&lt;p&gt;
-&lt;b&gt;NOTE:&lt;/b&gt; This option might not work properly or not work at all in some UNIX/Linux distributions. If you encounter a problem when using this option, please check the FAQ section at http://konqueror.kde.org.
+&lt;b&gt;NOTE:&lt;/b&gt; This option might not work properly or not work at all in some UNIX/Linux distributions. If you encounter a problem when using this option, please contact the Trinity developers or file a bug report at http://bugs.trinitydesktop.org/.
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
diff --git a/kcontrol/tdeio/policydlg_ui.ui b/kcontrol/tdeio/policydlg_ui.ui
index 015359829..2fecfa6d9 100644
--- a/kcontrol/tdeio/policydlg_ui.ui
+++ b/kcontrol/tdeio/policydlg_ui.ui
@@ -31,7 +31,7 @@
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-Enter the host or domain to which this policy applies, e.g. &lt;b&gt;www.kde.org&lt;/b&gt; or &lt;b&gt;.kde.org&lt;/b&gt;.
+Enter the host or domain to which this policy applies, e.g. &lt;b&gt;www.trinitydesktop.org&lt;/b&gt; or &lt;b&gt;.trinitydesktop.org&lt;/b&gt;.
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -41,7 +41,7 @@ Enter the host or domain to which this policy applies, e.g. &lt;b&gt;www.kde.org
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-Enter the host or domain to which this policy applies, e.g. &lt;b&gt;www.kde.org&lt;/b&gt; or &lt;b&gt;.kde.org&lt;/b&gt;.
+Enter the host or domain to which this policy applies, e.g. &lt;b&gt;www.trinitydesktop.org&lt;/b&gt; or &lt;b&gt;.trinitydesktop.org&lt;/b&gt;.
 &lt;/qt&gt;</string>
             </property>
         </widget>
diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui
index c3c364f84..c4e46d9c9 100644
--- a/kcontrol/tdeio/useragentdlg_ui.ui
+++ b/kcontrol/tdeio/useragentdlg_ui.ui
@@ -14,7 +14,7 @@
     </property>
     <property name="whatsThis" stdset="0">
         <string>&lt;qt&gt;
-Here you can modify the default browser-identification text or set a site &lt;code&gt;(eg. www.kde.org)&lt;/code&gt; or a domain &lt;code&gt;(eg. kde.org)&lt;/code&gt; specific identification text.&lt;p&gt;
+Here you can modify the default browser-identification text or set a site &lt;code&gt;(eg. www.trinitydesktop.org)&lt;/code&gt; or a domain &lt;code&gt;(eg. trinitydesktop.org)&lt;/code&gt; specific identification text.&lt;p&gt;
 To add a new site specific identification text, click the &lt;code&gt;New&lt;/code&gt; button and supply the necessary information. To change an existing site specific entry, click on the &lt;code&gt;Change&lt;/code&gt; button. The &lt;code&gt;Delete&lt;/code&gt; button will remove the selected site specific identification text, causing the setting to be used for that site or domain.
 &lt;/qt&gt;</string>
     </property>
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index daf5542e0..13d3b9736 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -509,7 +509,7 @@
                 <cstring>cbCommand</cstring>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.tderc".</string>
+                <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.trinitydesktop.org" or a local one like "~/.tderc".</string>
             </property>
         </widget>
         <widget class="TQLabel" row="0" column="0">
@@ -550,7 +550,7 @@
                 </size>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.tderc".</string>
+                <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.trinitydesktop.org" or a local one like "~/.tderc".</string>
             </property>
         </widget>
         <widget class="TQLabel" row="0" column="1">
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 467377202..8f22070cf 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -138,8 +138,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
         i18n("Sy&nchronize contents of the clipboard and the selection"),
         group );
     TQWhatsThis::add( cbSynchronize,
-      i18n("Selecting this option synchronizes these two buffers, so they "
-           "work the same way as in KDE 1.x and 2.x.") );
+      i18n("Selecting this option synchronizes these two buffers.") );
 
     cbSeparate = new TQRadioButton(
         i18n("Separate clipboard and selection"), group );