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

tdeio/misc/tdewalletd/tdewalletwizard.ui

@@ -13,7 +13,7 @@
         </rect>
     </property>
     <property name="caption">
-        <string>KDE Wallet Wizard</string>
+        <string>TDE Wallet Wizard</string>
     </property>
     <widget class="TQWidget">
         <property name="name">
@@ -53,7 +53,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>&lt;u&gt;TDEWallet&lt;/u&gt; - The KDE Wallet System</string>
+                    <string>&lt;u&gt;TDEWallet&lt;/u&gt; - The TDE Wallet System</string>
                 </property>
                 <property name="textFormat">
                     <enum>RichText</enum>
@@ -78,7 +78,7 @@
                     <number>26</number>
                 </property>
                 <property name="text">
-                    <string>Welcome to TDEWallet, the KDE Wallet System.  TDEWallet allows you to store your passwords and other personal information on disk in an encrypted file, preventing others from viewing the information.  This wizard will tell you about TDEWallet and help you configure it for the first time.</string>
+                    <string>Welcome to TDEWallet, the TDE Wallet System.  TDEWallet allows you to store your passwords and other personal information on disk in an encrypted file, preventing others from viewing the information.  This wizard will tell you about TDEWallet and help you configure it for the first time.</string>
                 </property>
                 <property name="textFormat">
                     <enum>RichText</enum>
@@ -177,7 +177,7 @@
                     <cstring>textLabel2_3</cstring>
                 </property>
                 <property name="text">
-                    <string>The KDE Wallet system stores your data in a &lt;i&gt;wallet&lt;/i&gt; file on your local hard disk.  The data is only written in encrypted form, presently using the blowfish algorithm with your password as the key.  When a wallet is opened, the wallet manager application will launch and display an icon in the system tray.  You can use this application to manage your wallets.  It even permits you to drag wallets and wallet contents, allowing you to easily copy a wallet to a remote system.</string>
+                    <string>The TDE Wallet system stores your data in a &lt;i&gt;wallet&lt;/i&gt; file on your local hard disk.  The data is only written in encrypted form, presently using the blowfish algorithm with your password as the key.  When a wallet is opened, the wallet manager application will launch and display an icon in the system tray.  You can use this application to manage your wallets.  It even permits you to drag wallets and wallet contents, allowing you to easily copy a wallet to a remote system.</string>
                 </property>
                 <property name="textFormat">
                     <enum>RichText</enum>
@@ -201,7 +201,7 @@
                     <cstring>textLabel3</cstring>
                 </property>
                 <property name="text">
-                    <string>Various applications may attempt to use the KDE wallet to store passwords or other information such as web form data and cookies.  If you would like these applications to use the wallet, you must enable it now and choose a password.  The password you choose &lt;i&gt;cannot&lt;/i&gt; be recovered if it is lost, and will allow anyone who knows it to obtain all the information contained in the wallet.</string>
+                    <string>Various applications may attempt to use the TDE wallet to store passwords or other information such as web form data and cookies.  If you would like these applications to use the wallet, you must enable it now and choose a password.  The password you choose &lt;i&gt;cannot&lt;/i&gt; be recovered if it is lost, and will allow anyone who knows it to obtain all the information contained in the wallet.</string>
                 </property>
                 <property name="textFormat">
                     <enum>RichText</enum>
@@ -298,7 +298,7 @@
                     <cstring>_useWallet</cstring>
                 </property>
                 <property name="text">
-                    <string>Yes, I wish to use the KDE wallet to store my personal information.</string>
+                    <string>Yes, I wish to use the TDE wallet to store my personal information.</string>
                 </property>
             </widget>
             <spacer row="2" column="1">
@@ -398,7 +398,7 @@
                     <cstring>textLabel1_3</cstring>
                 </property>
                 <property name="text">
-                    <string>The KDE Wallet system allows you to control the level of security of your personal data.  Some of these settings do impact usability.  While the default settings are generally acceptable for most users, you may wish to change some of them.  You may further tune these settings from the TDEWallet control module.</string>
+                    <string>The TDE Wallet system allows you to control the level of security of your personal data.  Some of these settings do impact usability.  While the default settings are generally acceptable for most users, you may wish to change some of them.  You may further tune these settings from the TDEWallet control module.</string>
                 </property>
                 <property name="textFormat">
                     <enum>RichText</enum>

tdespell2/ui/configui.ui

@@ -56,7 +56,7 @@
                         <string>Skip all &amp;uppercase words</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>If checked, words that consist of only uppercase letters are not spell checked. This is useful if you have a lot of acronyms, such as KDE for example.</string>
+                        <string>If checked, words that consist of only uppercase letters are not spell checked. This is useful if you have a lot of acronyms, such as TDE for example.</string>
                     </property>
                 </widget>
                 <widget class="TQCheckBox" row="2" column="0">