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 @@
00085
00086 TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
00087 TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
-00088 TQRadioButton* btnPasswordSaveKWallet = new TQRadioButton( i18n( "Use KWallet" ), gboxPassword, "btnPasswordSaveKWallet" );
+00088 TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
00089 grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
00090 grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-00091 grpPasswordStorage->insert( btnPasswordSaveKWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+00091 grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
00092 TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
00093 TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
-00094 TQToolTip::add( btnPasswordSaveKWallet, i18n( "Use KWallet to save the password. Maybe you have to type in the KWallet master password at first server connect." ) );
+00094 TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
00095 layPasswordStorage->addWidget( btnPasswordDontSave, 0, 0 );
00096 layPasswordStorage->addWidget( btnPasswordSaveFile, 0, 1 );
-00097 layPasswordStorage->addWidget( btnPasswordSaveKWallet, 1, 0 );
+00097 layPasswordStorage->addWidget( btnPasswordSaveTDEWallet, 1, 0 );
00098
00099 //password edit line00100 txtPassword = new KPasswordEdit( gboxPassword, "txtUser" );
@@ -216,7 +216,7 @@
00199 break;
00200 case ID_BUTTON_PASSWORD_SAVE_KWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
00201 config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
-00202 KWalletAccess::savePassword( txtAccount->text(), pass );
+00202 TDEWalletAccess::savePassword( txtAccount->text(), pass );
00203 break;
00204 default : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE );
00205 config->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
/**
- * @brief Provides routines to save and read passwords using KWallet.
+ * @brief Provides routines to save and read passwords using TDEWallet.
* @author Ulrich Weigelt
*/
-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
/**
- * @brief Provides routines to save and read passwords using KWallet.
+ * @brief Provides routines to save and read passwords using TDEWallet.
* @author Ulrich Weigelt
*/
-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