26 files changed, 189 insertions, 189 deletions
diff --git a/ChangeLog b/ChangeLog
index 433db92..b1b6fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -172,7 +172,7 @@ Jul 06 2007 V3.2.0
 	The warnings that kshowmail couldn't connect to the server during refresh,
 	if there is no network connection available, can be disabled now.
 
-	You can use KWallet to store the passwords.
+	You can use TDEWallet to store the passwords.
 
 Jul 14 2007 V3.2.1
 	Fixed bug where if you configure 2 accounts, retrieve mail, and then deactivate
diff --git a/doc/html/configelem_8cpp-source.html b/doc/html/configelem_8cpp-source.html
index f01995c..ef516d8 100644
--- a/doc/html/configelem_8cpp-source.html
+++ b/doc/html/configelem_8cpp-source.html
@@ -313,7 +313,7 @@
 <a name="l00296"></a>00296       <span class="comment">//store the password</span>
 <a name="l00297"></a>00297       <a class="code" href="classConfigElem.html#6edf15369f3e906a04dff0b92f5b3c2d">setPassword</a>( password );
 <a name="l00298"></a>00298 
-<a name="l00299"></a>00299       <span class="comment">//save password in file or KWallet</span>
+<a name="l00299"></a>00299       <span class="comment">//save password in file or TDEWallet</span>
 <a name="l00300"></a>00300       TDEConfig* config = TDEApplication::kApplication()-&gt;config();
 <a name="l00301"></a>00301       config-&gt;setGroup( <a class="code" href="classConfigElem.html#760e18ad688d55cd76bfeeb4958df769">getAccountName</a>() );
 <a name="l00302"></a>00302 
@@ -323,7 +323,7 @@
 <a name="l00306"></a>00306         config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 <a name="l00307"></a>00307 
 <a name="l00308"></a>00308       <span class="keywordflow">if</span>( <a class="code" href="classConfigElem.html#1ad409223125a43d257cd7666c8c7284">PasswordStorage</a> == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
-<a name="l00309"></a>00309         <a class="code" href="namespaceKWalletAccess.html#0687cd1465352be5b3572cdfd2411219">KWalletAccess::savePassword</a>( <a class="code" href="classConfigElem.html#760e18ad688d55cd76bfeeb4958df769">getAccountName</a>(), <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>.pass() );
+<a name="l00309"></a>00309         <a class="code" href="namespaceTDEWalletAccess.html#0687cd1465352be5b3572cdfd2411219">TDEWalletAccess::savePassword</a>( <a class="code" href="classConfigElem.html#760e18ad688d55cd76bfeeb4958df769">getAccountName</a>(), <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>.pass() );
 <a name="l00310"></a>00310 
 <a name="l00311"></a>00311       config-&gt;sync();
 <a name="l00312"></a>00312 
@@ -1175,7 +1175,7 @@
 <a name="l01158"></a>01158   {
 <a name="l01159"></a>01159     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE    : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: don't save"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
 <a name="l01160"></a>01160     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE    : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: save in file"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
-<a name="l01161"></a>01161     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: use KWallet"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
+<a name="l01161"></a>01161     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: use TDEWallet"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
 <a name="l01162"></a>01162     <span class="keywordflow">default</span>                                         : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: invalid value"</span> &lt;&lt; endl;
 <a name="l01163"></a>01163 
 <a name="l01164"></a>01164   }
diff --git a/doc/html/configlist_8cpp-source.html b/doc/html/configlist_8cpp-source.html
index 9f97aae..c074acd 100644
--- a/doc/html/configlist_8cpp-source.html
+++ b/doc/html/configlist_8cpp-source.html
@@ -872,7 +872,7 @@
 <a name="l00855"></a>00855 
 <a name="l00856"></a>00856       <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET:
 <a name="l00857"></a>00857         acc-&gt;<a class="code" href="classConfigElem.html#58f9d269bd389c52718d78d7615c4431">setPasswordStorage</a>( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
-<a name="l00858"></a>00858         acc-&gt;<a class="code" href="classConfigElem.html#6edf15369f3e906a04dff0b92f5b3c2d">setPassword</a>( <a class="code" href="namespaceKWalletAccess.html#2ce179e4ef9e2a06990252aca555b2fa">KWalletAccess::getPassword</a>( *it ) );
+<a name="l00858"></a>00858         acc-&gt;<a class="code" href="classConfigElem.html#6edf15369f3e906a04dff0b92f5b3c2d">setPassword</a>( <a class="code" href="namespaceTDEWalletAccess.html#2ce179e4ef9e2a06990252aca555b2fa">TDEWalletAccess::getPassword</a>( *it ) );
 <a name="l00859"></a>00859         <span class="keywordflow">break</span>;
 <a name="l00860"></a>00860 
 <a name="l00861"></a>00861       <span class="keywordflow">default</span>:
diff --git a/doc/html/constants_8h-source.html b/doc/html/constants_8h-source.html
index 0dbd0d9..712369f 100644
--- a/doc/html/constants_8h-source.html
+++ b/doc/html/constants_8h-source.html
@@ -114,7 +114,7 @@
 <a name="l00101"></a><a class="code" href="constants_8h.html#5e21dd68f2473ee5d2e91f97bdce2590">00101</a> <span class="preprocessor"></span><span class="preprocessor">  #define DEFAULT_ACCOUNT_USER ""</span>
 <a name="l00102"></a><a class="code" href="constants_8h.html#83a0d3aedc09d50d5bbbbd3195e1e62d">00102</a> <span class="preprocessor"></span><span class="preprocessor">  #define DEFAULT_ACCOUNT_PASSWORD ""</span>
 <a name="l00103"></a><a class="code" href="constants_8h.html#b05e161c82454b9e74eef575dded73a2">00103</a> <span class="preprocessor"></span><span class="preprocessor">  #define DEFAULT_ACCOUNT_PASSWORD_STORAGE  1</span>
-<a name="l00104"></a>00104 <span class="preprocessor"></span>    <span class="comment">//1: don't save, 2: save in file, 3: use KWallet</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>    <span class="comment">//1: don't save, 2: save in file, 3: use TDEWallet</span>
 <a name="l00105"></a><a class="code" href="constants_8h.html#482e80ded9e21ffa630fbd20e1077652">00105</a> <span class="preprocessor">  #define DEFAULT_ACCOUNT_ACTIVE true</span>
 <a name="l00106"></a><a class="code" href="constants_8h.html#7abe72ff514c57f9b2c9ba008ff14578">00106</a> <span class="preprocessor"></span><span class="preprocessor">  #define DEFAULT_ACCOUNT_SECTRANSFER 1</span>
 <a name="l00107"></a>00107 <span class="preprocessor"></span>    <span class="comment">//1: no secure transfer, 2: SSL, 3: TLS</span>
diff --git a/doc/html/namespacemembers.html b/doc/html/namespacemembers.html
index ae30db4..85b3614 100644
--- a/doc/html/namespacemembers.html
+++ b/doc/html/namespacemembers.html
@@ -100,7 +100,7 @@ Here is a list of all namespace members with links to the namespace documentatio
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>getPassword()
-: <a class="el" href="namespaceKWalletAccess.html#2ce179e4ef9e2a06990252aca555b2fa">KWalletAccess</a>
+: <a class="el" href="namespaceTDEWalletAccess.html#2ce179e4ef9e2a06990252aca555b2fa">TDEWalletAccess</a>
 </ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>hexbyt()
@@ -122,7 +122,7 @@ Here is a list of all namespace members with links to the namespace documentatio
 </ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>savePassword()
-: <a class="el" href="namespaceKWalletAccess.html#0687cd1465352be5b3572cdfd2411219">KWalletAccess</a>
+: <a class="el" href="namespaceTDEWalletAccess.html#0687cd1465352be5b3572cdfd2411219">TDEWalletAccess</a>
 <li>showing
 : <a class="el" href="namespaceTypes.html#dc227eb5720632a8290561b001aaa5655ee02dbb2bbc5f45a1a2517f7536c77c">Types</a>
 <li>State_Type
diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html
index 522b948..91351c3 100644
--- a/doc/html/namespaces.html
+++ b/doc/html/namespaces.html
@@ -23,7 +23,7 @@
   <tr><td class="indexkey"><a class="el" href="namespaceConstants.html">Constants</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceEncryption.html">Encryption</a></td><td class="indexvalue">Provides functions to crypt and decrypt a password </td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceKIO.html">KIO</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="namespaceKWalletAccess.html">KWalletAccess</a></td><td class="indexvalue">Provides routines to save and read passwords using KWallet </td></tr>
+  <tr><td class="indexkey"><a class="el" href="namespaceTDEWalletAccess.html">TDEWalletAccess</a></td><td class="indexvalue">Provides routines to save and read passwords using TDEWallet </td></tr>
   <tr><td class="indexkey"><a class="el" href="namespacestd.html">std</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceTypes.html">Types</a></td><td class="indexvalue"></td></tr>
 </table>
diff --git a/doc/html/serverdialog_8cpp-source.html b/doc/html/serverdialog_8cpp-source.html
index d136003..5c23848 100644
--- a/doc/html/serverdialog_8cpp-source.html
+++ b/doc/html/serverdialog_8cpp-source.html
@@ -102,16 +102,16 @@
 <a name="l00085"></a>00085 
 <a name="l00086"></a>00086   TQRadioButton* btnPasswordDontSave = <span class="keyword">new</span> TQRadioButton( i18n( <span class="stringliteral">"Don't save"</span> ), gboxPassword, <span class="stringliteral">"btnPasswordDontSave"</span> );
 <a name="l00087"></a>00087   TQRadioButton* btnPasswordSaveFile = <span class="keyword">new</span> TQRadioButton( i18n( <span class="stringliteral">"Save password"</span>), gboxPassword, <span class="stringliteral">"btnPasswordSaveFile"</span> );
-<a name="l00088"></a>00088   TQRadioButton* btnPasswordSaveKWallet = <span class="keyword">new</span> TQRadioButton( i18n( <span class="stringliteral">"Use KWallet"</span> ), gboxPassword, <span class="stringliteral">"btnPasswordSaveKWallet"</span> );
+<a name="l00088"></a>00088   TQRadioButton* btnPasswordSaveTDEWallet = <span class="keyword">new</span> TQRadioButton( i18n( <span class="stringliteral">"Use TDEWallet"</span> ), gboxPassword, <span class="stringliteral">"btnPasswordSaveTDEWallet"</span> );
 <a name="l00089"></a>00089   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
 <a name="l00090"></a>00090   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-<a name="l00091"></a>00091   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordSaveKWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+<a name="l00091"></a>00091   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
 <a name="l00092"></a>00092   TQToolTip::add( btnPasswordDontSave, i18n( <span class="stringliteral">"Don't save password. KShowmail will ask you for it at first server connect."</span> ) );
 <a name="l00093"></a>00093   TQToolTip::add( btnPasswordSaveFile, i18n( <span class="stringliteral">"Save password in the configuration file. Not recommended, because the password is just lightly encrypted"</span> ) );
-<a name="l00094"></a>00094   TQToolTip::add( btnPasswordSaveKWallet, i18n( <span class="stringliteral">"Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect."</span> ) );
+<a name="l00094"></a>00094   TQToolTip::add( btnPasswordSaveTDEWallet, i18n( <span class="stringliteral">"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect."</span> ) );
 <a name="l00095"></a>00095   layPasswordStorage-&gt;addWidget( btnPasswordDontSave, 0, 0 );
 <a name="l00096"></a>00096   layPasswordStorage-&gt;addWidget( btnPasswordSaveFile, 0, 1 );
-<a name="l00097"></a>00097   layPasswordStorage-&gt;addWidget( btnPasswordSaveKWallet, 1, 0 );
+<a name="l00097"></a>00097   layPasswordStorage-&gt;addWidget( btnPasswordSaveTDEWallet, 1, 0 );
 <a name="l00098"></a>00098 
 <a name="l00099"></a>00099   <span class="comment">//password edit line</span>
 <a name="l00100"></a>00100   <a class="code" href="classServerDialog.html#8630fd27107213fd88fbaf0db02793d6">txtPassword</a> = <span class="keyword">new</span> KPasswordEdit( gboxPassword, <span class="stringliteral">"txtUser"</span> );
@@ -216,7 +216,7 @@
 <a name="l00199"></a>00199                                            <span class="keywordflow">break</span>;
 <a name="l00200"></a>00200     <span class="keywordflow">case</span> ID_BUTTON_PASSWORD_SAVE_KWALLET : config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
 <a name="l00201"></a>00201                                            config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
-<a name="l00202"></a>00202                                            <a class="code" href="namespaceKWalletAccess.html#0687cd1465352be5b3572cdfd2411219">KWalletAccess::savePassword</a>( <a class="code" href="classServerDialog.html#690681b24cfd21ebdc4d5543bee5b4a3">txtAccount</a>-&gt;text(), pass );
+<a name="l00202"></a>00202                                            <a class="code" href="namespaceTDEWalletAccess.html#0687cd1465352be5b3572cdfd2411219">TDEWalletAccess::savePassword</a>( <a class="code" href="classServerDialog.html#690681b24cfd21ebdc4d5543bee5b4a3">txtAccount</a>-&gt;text(), pass );
 <a name="l00203"></a>00203                                            <span class="keywordflow">break</span>;
 <a name="l00204"></a>00204     <span class="keywordflow">default</span>                              : config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
 <a name="l00205"></a>00205                                            config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 356e726..43b11b5 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -303,7 +303,7 @@ bool ConfigElem::assertPassword( bool force )
       //store the password
       setPassword( password );
 
-      //save password in file or KWallet
+      //save password in file or TDEWallet
       TDEConfig* config = TDEApplication::kApplication()->config();
       config->setGroup( getAccountName() );
 
@@ -313,7 +313,7 @@ bool ConfigElem::assertPassword( bool force )
         config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 
       if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
-        KWalletAccess::savePassword( getAccountName(), m_url.pass() );
+        TDEWalletAccess::savePassword( getAccountName(), m_url.pass() );
 
       config->sync();
 
@@ -1211,7 +1211,7 @@ void ConfigElem::printSetup( ) const
   {
     case CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE    : kdDebug() << "Password Storage: don't save" << endl; break;
     case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE    : kdDebug() << "Password Storage: save in file" << endl; break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() << "Password Storage: use KWallet" << endl; break;
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() << "Password Storage: use TDEWallet" << endl; break;
     default                                         : kdDebug() << "Password Storage: invalid value" << endl;
 
   }
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index c435d01..58bb90a 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -888,7 +888,7 @@ void ConfigList::refreshSetup( TDEListView* view )
 
       case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET:
         acc->setPasswordStorage( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
-        acc->setPassword( KWalletAccess::getPassword( *it ) );
+        acc->setPassword( TDEWalletAccess::getPassword( *it ) );
         break;
 
       default:
diff --git a/kshowmail/constants.h b/kshowmail/constants.h
index fe91a2a..b36a36f 100644
--- a/kshowmail/constants.h
+++ b/kshowmail/constants.h
@@ -101,7 +101,7 @@ namespace Constants
   #define DEFAULT_ACCOUNT_USER ""
   #define DEFAULT_ACCOUNT_PASSWORD ""
   #define DEFAULT_ACCOUNT_PASSWORD_STORAGE  1
-    //1: don't save, 2: save in file, 3: use KWallet
+    //1: don't save, 2: save in file, 3: use TDEWallet
   #define DEFAULT_ACCOUNT_ACTIVE true
   #define DEFAULT_ACCOUNT_SECTRANSFER 1
     //1: no secure transfer, 2: SSL, 3: TLS
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.cpp b/kshowmail/kcmconfigs/accountsetupdialog.cpp
index dc800ee..9e48369 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.cpp
+++ b/kshowmail/kcmconfigs/accountsetupdialog.cpp
@@ -88,16 +88,16 @@ AccountSetupDialog::AccountSetupDialog( TQWidget* parent, TDEListView* view, Acc
 
   TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
   TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
-  TQRadioButton* btnPasswordSaveKWallet = new TQRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
+  TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
   grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
   grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-  grpPasswordStorage->insert( btnPasswordSaveKWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
   TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
   TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
-  TQToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
+  TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
   layPasswordStorage->addWidget( btnPasswordDontSave, 0, 0 );
   layPasswordStorage->addWidget( btnPasswordSaveFile, 0, 1 );
-  layPasswordStorage->addWidget( btnPasswordSaveKWallet, 1, 0 );
+  layPasswordStorage->addWidget( btnPasswordSaveTDEWallet, 1, 0 );
 
   //password edit line
   txtPassword = new KPasswordEdit( gboxPassword, "txtUser" );
diff --git a/kshowmail/kcmconfigs/accountsetupitem.cpp b/kshowmail/kcmconfigs/accountsetupitem.cpp
index d7846fe..6ca8ad4 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.cpp
+++ b/kshowmail/kcmconfigs/accountsetupitem.cpp
@@ -159,9 +159,9 @@ void AccountSetupItem::save() const
   else
     config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 
-  //save password in KWallet if desired
+  //save password in TDEWallet if desired
   if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
-    KWalletAccess::savePassword( getAccountName(), getPassword() );
+    TDEWalletAccess::savePassword( getAccountName(), getPassword() );
 
   config->writeEntry( CONFIG_ENTRY_ACCOUNT_ACTIVE, getActive() );
   config->writeEntry( CONFIG_ENTRY_ACCOUNT_SECTRANSFER, getTransferSecurity() );
@@ -181,7 +181,7 @@ void AccountSetupItem::load( )
   if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
     _password = decrypt( config->readEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, DEFAULT_ACCOUNT_PASSWORD ) );
   else if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
-    _password = KWalletAccess::getPassword( getAccountName() );
+    _password = TDEWalletAccess::getPassword( getAccountName() );
   else
     _password = TQString::null;
 
diff --git a/kshowmail/kcmconfigs/tdewalletaccess.cpp b/kshowmail/kcmconfigs/tdewalletaccess.cpp
index 1f48e1c..4aaf5a8 100644
--- a/kshowmail/kcmconfigs/tdewalletaccess.cpp
+++ b/kshowmail/kcmconfigs/tdewalletaccess.cpp
@@ -9,40 +9,40 @@
 #include "tdewalletaccess.h"
 
 
-bool KWalletAccess::savePassword( const TQString & account, const TQString & password )
+bool TDEWalletAccess::savePassword( const TQString & account, const TQString & password )
 {
-  //check for enabled KWallet
-  if( !KWallet::Wallet::isEnabled() )
+  //check for enabled TDEWallet
+  if( !TDEWallet::Wallet::isEnabled() )
   {
-    KMessageBox::error( NULL, i18n( "KWallet is not available." ) );
+    KMessageBox::error( NULL, i18n( "TDEWallet is not available." ) );
     return false;
   }
 
   //get wallet name for network data
-  TQString name = KWallet::Wallet::NetworkWallet();
+  TQString name = TDEWallet::Wallet::NetworkWallet();
   if( name == "" || name == TQString::null )
   {
-    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from TDEWallet." ) );
     return false;
   }
 
   //open wallet
   //we want to create a connection object just at first call of this function
-  static KWallet::Wallet* wallet;
+  static TDEWallet::Wallet* wallet;
 
   if( wallet == NULL )
   {
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
   else if( !wallet->isOpen() )
   {
     delete wallet;
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
 
   if( wallet == NULL )
   {
-    KMessageBox::error( NULL, i18n( "Could not open KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open TDEWallet." ) );
     return false;
   }
 
@@ -53,7 +53,7 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
 
     if( !createFolderSuccess )
     {
-      KMessageBox::error( NULL, i18n( "Could not create folder for KShowmail in KWallet." ) );
+      KMessageBox::error( NULL, i18n( "Could not create folder for KShowmail in TDEWallet." ) );
       return false;
     }
   }
@@ -62,7 +62,7 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
   bool setFolderSuccess = wallet->setFolder( "KShowmail" );
   if( !setFolderSuccess )
   {
-    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in TDEWallet." ) );
     return false;
   }
 
@@ -70,7 +70,7 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
   int writePasswordSuccess = wallet->writePassword( account, password );
   if( writePasswordSuccess != 0 )
   {
-    KMessageBox::error( NULL, i18n( "Could not save password in KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not save password in TDEWallet." ) );
     return false;
   }
 
@@ -78,40 +78,40 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
   return true;
 }
 
-TQString KWalletAccess::getPassword( const TQString & account )
+TQString TDEWalletAccess::getPassword( const TQString & account )
 {
-  //check for enabled KWallet
-  if( !KWallet::Wallet::isEnabled() )
+  //check for enabled TDEWallet
+  if( !TDEWallet::Wallet::isEnabled() )
   {
-    KMessageBox::error( NULL, i18n( "KWallet is not available." ) );
+    KMessageBox::error( NULL, i18n( "TDEWallet is not available." ) );
     return TQString::null;
   }
 
   //get wallet name for network data
-  TQString name = KWallet::Wallet::NetworkWallet();
+  TQString name = TDEWallet::Wallet::NetworkWallet();
   if( name == "" || name == TQString::null )
   {
-    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from TDEWallet." ) );
     return TQString::null;
   }
 
   //open wallet
   //we want to create a connection object just at first call of this function
-  static KWallet::Wallet* wallet;
+  static TDEWallet::Wallet* wallet;
 
   if( wallet == NULL )
   {
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
   else if( !wallet->isOpen() )
   {
     delete wallet;
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
 
   if( wallet == NULL )
   {
-    KMessageBox::error( NULL, i18n( "Could not open KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open TDEWallet." ) );
     return TQString::null;
   }
 
@@ -119,7 +119,7 @@ TQString KWalletAccess::getPassword( const TQString & account )
   bool setFolderSuccess = wallet->setFolder( "KShowmail" );
   if( !setFolderSuccess )
   {
-    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in TDEWallet." ) );
     return TQString::null;
   }
 
@@ -129,7 +129,7 @@ TQString KWalletAccess::getPassword( const TQString & account )
   int readPasswordSuccess = wallet->readPassword( account, password );
   if( readPasswordSuccess != 0 )
   {
-    KMessageBox::error( NULL, i18n( "Could not get password of account %1 from KWallet." ).arg( account) );
+    KMessageBox::error( NULL, i18n( "Could not get password of account %1 from TDEWallet." ).arg( account) );
     return TQString::null;
   }
 
diff --git a/kshowmail/kcmconfigs/tdewalletaccess.h b/kshowmail/kcmconfigs/tdewalletaccess.h
index 905abd9..3bc68d8 100644
--- a/kshowmail/kcmconfigs/tdewalletaccess.h
+++ b/kshowmail/kcmconfigs/tdewalletaccess.h
@@ -19,14 +19,14 @@
 #include <tdelocale.h>
 
 /**
- * @brief Provides routines to save and read passwords using KWallet.
+ * @brief Provides routines to save and read passwords using TDEWallet.
  * @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
  */
-namespace KWalletAccess
+namespace TDEWalletAccess
 {
 
   /**
-   * Saves the given password into KWallet.
+   * Saves the given password into TDEWallet.
    * @param account account name
    * @param password the password
    * @return TRUE - password successfully saved
@@ -37,7 +37,7 @@ namespace KWalletAccess
   /**
    * Returns the password of the given account.
    * @param account account name
-   * @return the password or TQString::null, if the sought password is not stored in KWallet.
+   * @return the password or TQString::null, if the sought password is not stored in TDEWallet.
    */
   TQString getPassword( const TQString& account );
 }
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index 9d7ad94..3c0c7d9 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -94,16 +94,16 @@ ServerDialog::ServerDialog( TQWidget* parent, ConfigElem* item )
 
   TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
   TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
-  TQRadioButton* btnPasswordSaveKWallet = new TQRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
+  TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
   grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
   grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-  grpPasswordStorage->insert( btnPasswordSaveKWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
   TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
   TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
-  TQToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
+  TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
   layPasswordStorage->addWidget( btnPasswordDontSave, 0, 0 );
   layPasswordStorage->addWidget( btnPasswordSaveFile, 0, 1 );
-  layPasswordStorage->addWidget( btnPasswordSaveKWallet, 1, 0 );
+  layPasswordStorage->addWidget( btnPasswordSaveTDEWallet, 1, 0 );
 
   //password edit line
   txtPassword = new KPasswordEdit( gboxPassword, "txtUser" );
@@ -239,7 +239,7 @@ void ServerDialog::slotOk( )
                                            break;
     case ID_BUTTON_PASSWORD_SAVE_KWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
                                            config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
-                                           KWalletAccess::savePassword( txtAccount->text(), pass );
+                                           TDEWalletAccess::savePassword( txtAccount->text(), pass );
                                            break;
     default                              : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
                                            config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
diff --git a/kshowmail/tdewalletaccess.cpp b/kshowmail/tdewalletaccess.cpp
index 1f48e1c..4aaf5a8 100644
--- a/kshowmail/tdewalletaccess.cpp
+++ b/kshowmail/tdewalletaccess.cpp
@@ -9,40 +9,40 @@
 #include "tdewalletaccess.h"
 
 
-bool KWalletAccess::savePassword( const TQString & account, const TQString & password )
+bool TDEWalletAccess::savePassword( const TQString & account, const TQString & password )
 {
-  //check for enabled KWallet
-  if( !KWallet::Wallet::isEnabled() )
+  //check for enabled TDEWallet
+  if( !TDEWallet::Wallet::isEnabled() )
   {
-    KMessageBox::error( NULL, i18n( "KWallet is not available." ) );
+    KMessageBox::error( NULL, i18n( "TDEWallet is not available." ) );
     return false;
   }
 
   //get wallet name for network data
-  TQString name = KWallet::Wallet::NetworkWallet();
+  TQString name = TDEWallet::Wallet::NetworkWallet();
   if( name == "" || name == TQString::null )
   {
-    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from TDEWallet." ) );
     return false;
   }
 
   //open wallet
   //we want to create a connection object just at first call of this function
-  static KWallet::Wallet* wallet;
+  static TDEWallet::Wallet* wallet;
 
   if( wallet == NULL )
   {
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
   else if( !wallet->isOpen() )
   {
     delete wallet;
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
 
   if( wallet == NULL )
   {
-    KMessageBox::error( NULL, i18n( "Could not open KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open TDEWallet." ) );
     return false;
   }
 
@@ -53,7 +53,7 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
 
     if( !createFolderSuccess )
     {
-      KMessageBox::error( NULL, i18n( "Could not create folder for KShowmail in KWallet." ) );
+      KMessageBox::error( NULL, i18n( "Could not create folder for KShowmail in TDEWallet." ) );
       return false;
     }
   }
@@ -62,7 +62,7 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
   bool setFolderSuccess = wallet->setFolder( "KShowmail" );
   if( !setFolderSuccess )
   {
-    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in TDEWallet." ) );
     return false;
   }
 
@@ -70,7 +70,7 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
   int writePasswordSuccess = wallet->writePassword( account, password );
   if( writePasswordSuccess != 0 )
   {
-    KMessageBox::error( NULL, i18n( "Could not save password in KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not save password in TDEWallet." ) );
     return false;
   }
 
@@ -78,40 +78,40 @@ bool KWalletAccess::savePassword( const TQString & account, const TQString & pas
   return true;
 }
 
-TQString KWalletAccess::getPassword( const TQString & account )
+TQString TDEWalletAccess::getPassword( const TQString & account )
 {
-  //check for enabled KWallet
-  if( !KWallet::Wallet::isEnabled() )
+  //check for enabled TDEWallet
+  if( !TDEWallet::Wallet::isEnabled() )
   {
-    KMessageBox::error( NULL, i18n( "KWallet is not available." ) );
+    KMessageBox::error( NULL, i18n( "TDEWallet is not available." ) );
     return TQString::null;
   }
 
   //get wallet name for network data
-  TQString name = KWallet::Wallet::NetworkWallet();
+  TQString name = TDEWallet::Wallet::NetworkWallet();
   if( name == "" || name == TQString::null )
   {
-    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not get wallet name for network datas from TDEWallet." ) );
     return TQString::null;
   }
 
   //open wallet
   //we want to create a connection object just at first call of this function
-  static KWallet::Wallet* wallet;
+  static TDEWallet::Wallet* wallet;
 
   if( wallet == NULL )
   {
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
   else if( !wallet->isOpen() )
   {
     delete wallet;
-    wallet = KWallet::Wallet::openWallet( name );
+    wallet = TDEWallet::Wallet::openWallet( name );
   }
 
   if( wallet == NULL )
   {
-    KMessageBox::error( NULL, i18n( "Could not open KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open TDEWallet." ) );
     return TQString::null;
   }
 
@@ -119,7 +119,7 @@ TQString KWalletAccess::getPassword( const TQString & account )
   bool setFolderSuccess = wallet->setFolder( "KShowmail" );
   if( !setFolderSuccess )
   {
-    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in KWallet." ) );
+    KMessageBox::error( NULL, i18n( "Could not open folder for KShowmail in TDEWallet." ) );
     return TQString::null;
   }
 
@@ -129,7 +129,7 @@ TQString KWalletAccess::getPassword( const TQString & account )
   int readPasswordSuccess = wallet->readPassword( account, password );
   if( readPasswordSuccess != 0 )
   {
-    KMessageBox::error( NULL, i18n( "Could not get password of account %1 from KWallet." ).arg( account) );
+    KMessageBox::error( NULL, i18n( "Could not get password of account %1 from TDEWallet." ).arg( account) );
     return TQString::null;
   }
 
diff --git a/kshowmail/tdewalletaccess.h b/kshowmail/tdewalletaccess.h
index 905abd9..3bc68d8 100644
--- a/kshowmail/tdewalletaccess.h
+++ b/kshowmail/tdewalletaccess.h
@@ -19,14 +19,14 @@
 #include <tdelocale.h>
 
 /**
- * @brief Provides routines to save and read passwords using KWallet.
+ * @brief Provides routines to save and read passwords using TDEWallet.
  * @author Ulrich Weigelt <ulrich.weigelt@gmx.de>
  */
-namespace KWalletAccess
+namespace TDEWalletAccess
 {
 
   /**
-   * Saves the given password into KWallet.
+   * Saves the given password into TDEWallet.
    * @param account account name
    * @param password the password
    * @return TRUE - password successfully saved
@@ -37,7 +37,7 @@ namespace KWalletAccess
   /**
    * Returns the password of the given account.
    * @param account account name
-   * @return the password or TQString::null, if the sought password is not stored in KWallet.
+   * @return the password or TQString::null, if the sought password is not stored in TDEWallet.
    */
   TQString getPassword( const TQString& account );
 }
diff --git a/po/cs.po b/po/cs.po
index d429886..a9a55aa 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -144,7 +144,7 @@ msgid "Save password"
 msgstr "&Uložit heslo"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -160,7 +160,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1345,34 +1345,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182
diff --git a/po/de.po b/po/de.po
index 4e385b5..b0a166e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -142,8 +142,8 @@ msgid "Save password"
 msgstr "Passwort speichern"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
-msgstr "KWallet benutzen"
+msgid "Use TDEWallet"
+msgstr "TDEWallet benutzen"
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
 msgid ""
@@ -162,11 +162,11 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
-"KWallet zum Speichern des Passwortes benutzen. Eventuell werden Sie das "
-"Master-Passwort von KWallet beim Start von KShowmail eingeben müssen."
+"TDEWallet zum Speichern des Passwortes benutzen. Eventuell werden Sie das "
+"Master-Passwort von TDEWallet beim Start von KShowmail eingeben müssen."
 
 #: serverdialog.cpp:119 kcmconfigs/configdisplay.cpp:46
 #: kcmconfigs/accountsetupdialog.cpp:113 kshowmailview.cpp:53
@@ -1373,37 +1373,37 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
-msgstr "KWallet ist nicht verfügbar."
+msgid "TDEWallet is not available."
+msgstr "TDEWallet ist nicht verfügbar."
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
-"Konnte den Namen der Brieftasche für Netzwerk-Daten nicht von KWallet "
+"Konnte den Namen der Brieftasche für Netzwerk-Daten nicht von TDEWallet "
 "erhalten."
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
-msgstr "Konnte KWallet nicht öffnen."
+msgid "Could not open TDEWallet."
+msgstr "Konnte TDEWallet nicht öffnen."
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
-msgstr "Konnte keinen Ordner für KShowmail in KWallet anlegen."
+msgid "Could not create folder for KShowmail in TDEWallet."
+msgstr "Konnte keinen Ordner für KShowmail in TDEWallet anlegen."
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
-msgstr "Konnte den Ordner für KShowmail in KWallet nicht öffnen."
+msgid "Could not open folder for KShowmail in TDEWallet."
+msgstr "Konnte den Ordner für KShowmail in TDEWallet nicht öffnen."
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
-msgstr "Konnte das Passwort nicht in KWallet speichern."
+msgid "Could not save password in TDEWallet."
+msgstr "Konnte das Passwort nicht in TDEWallet speichern."
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
-msgstr "Konnte das Passwort für Konto %1 nicht aus KWallet auslesen."
+msgid "Could not get password of account %1 from TDEWallet."
+msgstr "Konnte das Passwort für Konto %1 nicht aus TDEWallet auslesen."
 
 #: kcmconfigs/accountsetupdialog.cpp:182
 msgid "Please enter an account name."
diff --git a/po/es.po b/po/es.po
index ecf827b..881acb6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -144,8 +144,8 @@ msgid "Save password"
 msgstr "Guardar la contraseña"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
-msgstr "Utilizar KWallet"
+msgid "Use TDEWallet"
+msgstr "Utilizar TDEWallet"
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
 msgid "Don't save password. KShowmail will ask you for it at first server connect."
@@ -161,10 +161,10 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
-"Utilizar KWallet para guardar la contraseña. Es posible que tenga que "
+"Utilizar TDEWallet para guardar la contraseña. Es posible que tenga que "
 "introducir la contraseña maestra cuando conecte con el servidor la primera vez."
 
 #: serverdialog.cpp:119 kcmconfigs/configdisplay.cpp:46
@@ -1358,35 +1358,35 @@ msgstr "Seleccione la acción para todos los correos que no han sido filtrados e
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
-msgstr "KWallet no está disponible."
+msgid "TDEWallet is not available."
+msgstr "TDEWallet no está disponible."
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
-msgstr "No se puede obtener el nombre de la cartera para los datos de la red desde KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
+msgstr "No se puede obtener el nombre de la cartera para los datos de la red desde TDEWallet."
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
-msgstr "No se puede abrir KWallet."
+msgid "Could not open TDEWallet."
+msgstr "No se puede abrir TDEWallet."
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
-msgstr "No se puede crear el directorio para KShowmail en KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
+msgstr "No se puede crear el directorio para KShowmail en TDEWallet."
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
-msgstr "No se puede abrir el directorio para KShowmail en KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
+msgstr "No se puede abrir el directorio para KShowmail en TDEWallet."
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
-msgstr "No se puede guardar la contraseña en KWallet."
+msgid "Could not save password in TDEWallet."
+msgstr "No se puede guardar la contraseña en TDEWallet."
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
-msgstr "No se puede obtener la contraseña para la cuenta %1 desde KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
+msgstr "No se puede obtener la contraseña para la cuenta %1 desde TDEWallet."
 
 #: kcmconfigs/accountsetupdialog.cpp:182
 msgid "Please enter an account name."
diff --git a/po/fr.po b/po/fr.po
index f10e3be..301001b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -142,7 +142,7 @@ msgid "Save password"
 msgstr "Sauver le password"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -158,7 +158,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1350,34 +1350,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182
diff --git a/po/hu.po b/po/hu.po
index a6c0550..1621926 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -141,7 +141,7 @@ msgid "Save password"
 msgstr "Jelszó Tárolása"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -157,7 +157,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1353,34 +1353,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182
diff --git a/po/it.po b/po/it.po
index 02c4e4d..984395d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -136,7 +136,7 @@ msgid "Save password"
 msgstr "Salva Password"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -152,7 +152,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1346,34 +1346,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182
diff --git a/po/kshowmail.pot b/po/kshowmail.pot
index 779a8a7..40ad37f 100644
--- a/po/kshowmail.pot
+++ b/po/kshowmail.pot
@@ -134,7 +134,7 @@ msgid "Save password"
 msgstr ""
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -150,7 +150,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1296,34 +1296,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182
diff --git a/po/ru.po b/po/ru.po
index d35ec71..913f7c7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -141,7 +141,7 @@ msgid "Save password"
 msgstr "Сохранять пароль"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -157,7 +157,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1364,34 +1364,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182
diff --git a/po/sv.po b/po/sv.po
index a6d79af..f8ccf26 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -147,7 +147,7 @@ msgid "Save password"
 msgstr "Spara lösenord"
 
 #: serverdialog.cpp:97 kcmconfigs/accountsetupdialog.cpp:91
-msgid "Use KWallet"
+msgid "Use TDEWallet"
 msgstr ""
 
 #: serverdialog.cpp:101 kcmconfigs/accountsetupdialog.cpp:95
@@ -163,7 +163,7 @@ msgstr ""
 
 #: serverdialog.cpp:103 kcmconfigs/accountsetupdialog.cpp:97
 msgid ""
-"Use KWallet to save the password. Maybe you have to type in the KWallet "
+"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet "
 "master password at first server connect."
 msgstr ""
 
@@ -1432,34 +1432,34 @@ msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:17 kcmconfigs/tdewalletaccess.cpp:86
 #: tdewalletaccess.cpp:17 tdewalletaccess.cpp:86
-msgid "KWallet is not available."
+msgid "TDEWallet is not available."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:25 kcmconfigs/tdewalletaccess.cpp:94
 #: tdewalletaccess.cpp:25 tdewalletaccess.cpp:94
-msgid "Could not get wallet name for network datas from KWallet."
+msgid "Could not get wallet name for network datas from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:45 kcmconfigs/tdewalletaccess.cpp:114
 #: tdewalletaccess.cpp:45 tdewalletaccess.cpp:114
-msgid "Could not open KWallet."
+msgid "Could not open TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:56 tdewalletaccess.cpp:56
-msgid "Could not create folder for KShowmail in KWallet."
+msgid "Could not create folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:65 kcmconfigs/tdewalletaccess.cpp:122
 #: tdewalletaccess.cpp:65 tdewalletaccess.cpp:122
-msgid "Could not open folder for KShowmail in KWallet."
+msgid "Could not open folder for KShowmail in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:73 tdewalletaccess.cpp:73
-msgid "Could not save password in KWallet."
+msgid "Could not save password in TDEWallet."
 msgstr ""
 
 #: kcmconfigs/tdewalletaccess.cpp:132 tdewalletaccess.cpp:132
-msgid "Could not get password of account %1 from KWallet."
+msgid "Could not get password of account %1 from TDEWallet."
 msgstr ""
 
 #: kcmconfigs/accountsetupdialog.cpp:182