Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

15 files changed, 23 insertions, 23 deletions

diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui
index 441b918de..34f8f9db5 100644
--- a/kcontrol/background/bgadvanced_ui.ui
+++ b/kcontrol/background/bgadvanced_ui.ui
@@ -352,7 +352,7 @@ You can also remove programs from this list clicking on the <b>Remove</
                         <string>Size of background cache:</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>In this box you can enter how much memory KDE should use for caching the background(s). If you have different backgrounds for the different desktops caching can make switching desktops smoother at the expense of higher memory use.</string>
+                        <string>In this box you can enter how much memory TDE should use for caching the background(s). If you have different backgrounds for the different desktops caching can make switching desktops smoother at the expense of higher memory use.</string>
                     </property>
                 </widget>
                 <widget class="TQSpinBox">
@@ -363,7 +363,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
                         <string> k</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>In this box you can enter how much memory KDE should use for caching the background(s). If you have different backgrounds for the different desktops caching can make switching desktops smoother at the expense of higher memory use.</string>
+                        <string>In this box you can enter how much memory TDE should use for caching the background(s). If you have different backgrounds for the different desktops caching can make switching desktops smoother at the expense of higher memory use.</string>
                     </property>
                 </widget>
                 <spacer>
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index 25ee7480f..ce89822d7 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -141,7 +141,7 @@
                         <string>&amp;Use KMail as preferred email client</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Kmail is the standard Mail program for the KDE desktop.</string>
+                        <string>Kmail is the standard Mail program for the TDE desktop.</string>
                     </property>
                 </widget>
                 <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index 5e9545270..c823ad095 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -28,7 +28,7 @@
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-Enable shortcuts that allow you to quickly search for information on the web. For example, entering the shortcut &lt;b&gt;gg:KDE&lt;/b&gt; will result in a search of the word &lt;b&gt;KDE&lt;/b&gt; on the Google(TM) search engine.
+Enable shortcuts that allow you to quickly search for information on the web. For example, entering the shortcut &lt;b&gt;gg:TDE&lt;/b&gt; will result in a search of the word &lt;b&gt;TDE&lt;/b&gt; on the Google(TM) search engine.
 &lt;/qt&gt;</string>
             </property>
         </widget>
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
index 458de9394..84539366f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
@@ -78,7 +78,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For example, the shortcut &lt;b&gt;av&lt;/b&gt; can be used as in &lt;b&gt;av&lt;/b&gt;:&lt;b&gt;my search&lt;/b&gt;
+The shortcuts entered here can be used as a pseudo-URI scheme in TDE. For example, the shortcut &lt;b&gt;av&lt;/b&gt; can be used as in &lt;b&gt;av&lt;/b&gt;:&lt;b&gt;my search&lt;/b&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -94,7 +94,7 @@ The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For exampl
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For example, the shortcut &lt;b&gt;av&lt;/b&gt; can be used as in &lt;b&gt;av&lt;/b&gt;:&lt;b&gt;my search&lt;/b&gt;
+The shortcuts entered here can be used as a pseudo-URI scheme in TDE. For example, the shortcut &lt;b&gt;av&lt;/b&gt; can be used as in &lt;b&gt;av&lt;/b&gt;:&lt;b&gt;my search&lt;/b&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui
index 3e4acb644..cd8331d27 100644
--- a/kcontrol/konqhtml/advancedTabOptions.ui
+++ b/kcontrol/konqhtml/advancedTabOptions.ui
@@ -167,7 +167,7 @@
                         <string>Open as tab in existing Konqueror when URL is called externally</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>When you click a URL in another KDE program or call kfmclient to open a URL, the current desktop will be searched for a non-minimized Konqueror and, if found, the URL opened as a new tab within it. Otherwise a new Konqueror window will be opened with the required URL.</string>
+                        <string>When you click a URL in another TDE program or call kfmclient to open a URL, the current desktop will be searched for a non-minimized Konqueror and, if found, the URL opened as a new tab within it. Otherwise a new Konqueror window will be opened with the required URL.</string>
                     </property>
                 </widget>
             </vbox>
diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui
index ddcc93ec9..623f47b80 100644
--- a/kcontrol/privacy/kprivacysettings.ui
+++ b/kcontrol/privacy/kprivacysettings.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>KPrivacySettings</class>
-<comment>KDE Privacy Settings Widget
+<comment>TDE Privacy Settings Widget
 Licensed under the terms of the LGPL.
 Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
 </comment>
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index bf42f4d49..ceaec9e3f 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -21,7 +21,7 @@
                 <cstring>TextLabel1</cstring>
             </property>
             <property name="text">
-                <string>&lt;b&gt;Unable to contact the KDE smartcard service.&lt;/b&gt;</string>
+                <string>&lt;b&gt;Unable to contact the TDE smartcard service.&lt;/b&gt;</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
@@ -44,9 +44,9 @@
                     </property>
                     <property name="text">
                         <string>
-1) The KDE 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 TDE Control Center to see if this message goes away.
 
-2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the tdelibs package with libpcsclite installed.</string>
+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>
                     <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index c3104f05b..e7a3344ce 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -61,7 +61,7 @@
                                     <string>Enable &amp;polling to autodetect card events</string>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>In most cases you should have this enabled. It allows KDE to automatically detect card insertion and reader hotplug events.</string>
+                                    <string>In most cases you should have this enabled. It allows TDE to automatically detect card insertion and reader hotplug events.</string>
                                 </property>
                             </widget>
                             <spacer row="0" column="0" rowspan="3" colspan="1">
@@ -92,7 +92,7 @@
                                     <string>Automatically &amp;launch card manager if inserted card is unclaimed</string>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>When you insert a smartcard, KDE can automatically launch a management tool if no other application attempts to use the card.</string>
+                                    <string>When you insert a smartcard, TDE can automatically launch a management tool if no other application attempts to use the card.</string>
                                 </property>
                             </widget>
                             <widget class="QCheckBox" row="1" column="1">
diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
index 03703bf1a..f26173353 100644
--- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
@@ -98,7 +98,7 @@ Treat all cookies as session cookies. Session cookies are small pieces of data t
                 <string>&lt;qt&gt;
 Determines how cookies received from a remote machine will be handled: 
 &lt;ul&gt;
-&lt;li&gt;&lt;b&gt;Ask&lt;/b&gt; will cause KDE to ask for your confirmation whenever a server wants to set a cookie."&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;Ask&lt;/b&gt; will cause TDE to ask for your confirmation whenever a server wants to set a cookie."&lt;/li&gt;
 &lt;li&gt;&lt;b&gt;Accept&lt;/b&gt; will cause cookies to be accepted without prompting you.&lt;/li&gt;
 &lt;li&gt;&lt;b&gt;Reject&lt;/b&gt; will cause the cookiejar to refuse all cookies it receives.&lt;/li&gt;
 &lt;/ul&gt;&lt;p&gt;
diff --git a/kcontrol/tdeio/socksbase.ui b/kcontrol/tdeio/socksbase.ui
index bfda8e776..4ef700888 100644
--- a/kcontrol/tdeio/socksbase.ui
+++ b/kcontrol/tdeio/socksbase.ui
@@ -62,7 +62,7 @@
                         <number>1</number>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>If you select Autodetect, then KDE will automatically search for an implementation of SOCKS on your computer.</string>
+                        <string>If you select Autodetect, then TDE will automatically search for an implementation of SOCKS on your computer.</string>
                     </property>
                 </widget>
                 <widget class="TQRadioButton" row="0" column="1">
@@ -76,7 +76,7 @@
                         <number>2</number>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This will force KDE to use NEC SOCKS if it can be found.</string>
+                        <string>This will force TDE to use NEC SOCKS if it can be found.</string>
                     </property>
                 </widget>
                 <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3">
@@ -150,7 +150,7 @@
                         <number>3</number>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This will force KDE to use Dante if it can be found.</string>
+                        <string>This will force TDE to use Dante if it can be found.</string>
                     </property>
                 </widget>
             </grid>
diff --git a/kcontrol/tdeio/uagentproviderdlg_ui.ui b/kcontrol/tdeio/uagentproviderdlg_ui.ui
index 2082e3db4..578721596 100644
--- a/kcontrol/tdeio/uagentproviderdlg_ui.ui
+++ b/kcontrol/tdeio/uagentproviderdlg_ui.ui
@@ -37,7 +37,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
 Enter the site or domain name where a fake browser identification should be used.&lt;p&gt;
-&lt;u&gt;NOTE:&lt;/u&gt; Wildcard syntax such as \"*,?\" is NOT allowed: instead, use the top level address of a site to make generic matches; for example, if you want all KDE sites to receive a fake browser identification, you would enter &lt;code&gt;.kde.org&lt;/code&gt; - the fake identity would then be sent to any KDE site that ends with &lt;code&gt;.kde.org&lt;/code&gt;.
+&lt;u&gt;NOTE:&lt;/u&gt; Wildcard syntax such as \"*,?\" is NOT allowed: instead, use the top level address of a site to make generic matches; for example, if you want all TDE sites to receive a fake browser identification, you would enter &lt;code&gt;.kde.org&lt;/code&gt; - the fake identity would then be sent to any TDE site that ends with &lt;code&gt;.kde.org&lt;/code&gt;.
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -48,7 +48,7 @@ Enter the site or domain name where a fake browser identification should be used
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
 Enter the site or domain name where a fake browser identification should be used.&lt;p&gt;
-&lt;u&gt;NOTE:&lt;/u&gt; Wildcard syntax such as \"*,?\" is NOT allowed: instead, use the top level address of a site to make generic matches; for example, if you want all KDE sites to receive a fake browser identification, you would enter &lt;code&gt;.kde.org&lt;/code&gt; - the fake identity would then be sent to any KDE site that ends with &lt;code&gt;.kde.org&lt;/code&gt;.
+&lt;u&gt;NOTE:&lt;/u&gt; Wildcard syntax such as \"*,?\" is NOT allowed: instead, use the top level address of a site to make generic matches; for example, if you want all TDE sites to receive a fake browser identification, you would enter &lt;code&gt;.kde.org&lt;/code&gt; - the fake identity would then be sent to any TDE site that ends with &lt;code&gt;.kde.org&lt;/code&gt;.
 &lt;/qt&gt;</string>
             </property>
         </widget>
diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui
index f3dc8392f..a5e3664de 100644
--- a/kcontrol/xinerama/xineramawidget.ui
+++ b/kcontrol/xinerama/xineramawidget.ui
@@ -201,7 +201,7 @@
                         <bool>false</bool>
                     </property>
                     <property name="text">
-                        <string>Show KDE splash screen on:</string>
+                        <string>Show TDE splash screen on:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>_unmanagedDisplay</cstring>
diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index 7e16696c6..2830c10e9 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -324,7 +324,7 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of KDE.</string>
+                                    <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of TDE.</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="3">
diff --git a/tdeioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui
index afde70c75..e4a98d6ed 100644
--- a/tdeioslave/media/tdecmodule/managermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/managermoduleview.ui
@@ -69,7 +69,7 @@
                     </property>
                     <property name="text">
                         <string>Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.&lt;br&gt;
-Some of the options are tristate. Leave them "undefined" to let KDE choose the best value depending on your media.</string>
+Some of the options are tristate. Leave them "undefined" to let TDE choose the best value depending on your media.</string>
                     </property>
                     <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index ccd462e1f..dbaee8b0b 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -155,7 +155,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                                       " active. If the mouse points nowhere, nothing has focus."
                                       " </ul>"
                                       "Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent certain"
-                                      " features such as the Alt+Tab walk through windows dialog in the KDE mode"
+                                      " features such as the Alt+Tab walk through windows dialog in the TDE mode"
                                       " from working properly."
                          );
     TQWhatsThis::add( focusCombo, wtstr);