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,"molkentin@kde.org");
setAboutData( about );
- setQuickHelp( i18n("
Service Manager
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:
"
+ setQuickHelp( i18n("Service Manager
This module allows you to have an overview of all plugins "
+ "running as TDE Services. Generally, there are two types of service:
"
"- Services invoked at startup
- Services called on demand
"
"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.
"
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
<qt>
Automatically detect and configure the proxy settings.<p>
Automatic detection is performed using the <b>Web Proxy Auto-Discovery Protocol (WPAD)</b>.<p>
-<b>NOTE:</b> 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.
+<b>NOTE:</b> 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/.
</qt>
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 @@
<qt>
-Enter the host or domain to which this policy applies, e.g. <b>www.kde.org</b> or <b>.kde.org</b>.
+Enter the host or domain to which this policy applies, e.g. <b>www.trinitydesktop.org</b> or <b>.trinitydesktop.org</b>.
</qt>
@@ -41,7 +41,7 @@ Enter the host or domain to which this policy applies, e.g. <b>www.kde.org
<qt>
-Enter the host or domain to which this policy applies, e.g. <b>www.kde.org</b> or <b>.kde.org</b>.
+Enter the host or domain to which this policy applies, e.g. <b>www.trinitydesktop.org</b> or <b>.trinitydesktop.org</b>.
</qt>
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 @@
<qt>
-Here you can modify the default browser-identification text or set a site <code>(eg. www.kde.org)</code> or a domain <code>(eg. kde.org)</code> specific identification text.<p>
+Here you can modify the default browser-identification text or set a site <code>(eg. www.trinitydesktop.org)</code> or a domain <code>(eg. trinitydesktop.org)</code> specific identification text.<p>
To add a new site specific identification text, click the <code>New</code> button and supply the necessary information. To change an existing site specific entry, click on the <code>Change</code> button. The <code>Delete</code> button will remove the selected site specific identification text, causing the setting to be used for that site or domain.
</qt>
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 @@
cbCommand
- 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".
+ 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".
@@ -550,7 +550,7 @@
- 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".
+ 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".
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 );