5 files changed, 96 insertions, 93 deletions

diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 2d7533c..8ee112c 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -12,5 +12,5 @@
 #include <qapplication.h>
 #include <qmessagebox.h>
-
+#include <klocale.h>
 #include <kdecore/kstandarddirs.h>
 #include <qfile.h>
@@ -148,8 +148,8 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
     int count = target.count(); 
     QProgressBar wid ( count );
-    wid.setCaption( tr("Deleting ..."));
+    wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {   
-        Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); 
+        Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count)); 
         wid.setProgress( iii ); 
         wid.raise();
@@ -173,6 +173,6 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     if ( !targetMail->createMbox(lfName))
         {
-            QMessageBox::critical(0,tr("Error creating new Folder"),
-                                  tr("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
+            QMessageBox::critical(0,i18n("Error creating new Folder"),
+                                  i18n("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
             return;
         }
@@ -181,5 +181,5 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     if ( t.count() == 0 ) {
         qDebug("There are no new messages %s", fromFolder->getName().latin1());
-        Global::statusMessage(tr("There are no new messages"));
+        Global::statusMessage(i18n("There are no new messages"));
         return;
     }
@@ -211,9 +211,9 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     qDebug("Downloaded %d messages ",n.count() );
     if ( n.count() == 0 ) {
-        Global::statusMessage(tr("There are no new messages"));
+        Global::statusMessage(i18n("There are no new messages"));
         return;
     }
     mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer());
-    Global::statusMessage(tr("Downloaded %1 messages").arg(n.count()));
+    Global::statusMessage(i18n("Downloaded %1 messages").arg(n.count()));
     
 #if 0
@@ -241,11 +241,11 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
         return;
     // wel, processevents is qite strange, we need a widget for getting  
-    // Global::statusMessage(tr("Copy2 message %1").arg(iii)); displaye
+    // Global::statusMessage(i18n("Copy2 message %1").arg(iii)); displaye
 
     QProgressBar wid ( count );
-    wid.setCaption( tr("Copying ..."));
+    wid.setCaption( i18n("Copying..."));
     wid.show();
     while (iii < count ) {  
-        Global::statusMessage(tr("Copy message %1 of %2").arg(iii).arg(count));
+        Global::statusMessage(i18n("Copy message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 8150453..3aec13d 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -49,5 +49,5 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
     //qDebug("imap progress %d of %d ",current,maximum  );
-    //Global::statusMessage(tr("Downloading message %1 of %2").arg( current).arg(maximum));
+    //Global::statusMessage(i18n("Downloading message %1 of %2").arg( current).arg(maximum));
     //qApp->processEvents()
     static int last = 0;
@@ -67,6 +67,6 @@ void IMAPwrapper::progress( QString m )
     QString mess;
     //qDebug("progress ");
-    if (  mMax ) mess = mProgrMess +tr(" message %1 of %2").arg( mCurrent++).arg(mMax);
-    else mess = mProgrMess +tr(" message %1").arg( mCurrent++);
+    if (  mMax ) mess = mProgrMess +i18n(" message %1 of %2").arg( mCurrent++).arg(mMax);
+    else mess = mProgrMess +i18n(" message %1").arg( mCurrent++);
     Global::statusMessage(mess);
     //qDebug("Progress %s %s", mess.latin1(), m.latin1());
@@ -101,5 +101,5 @@ bool IMAPwrapper::start_tls(bool force_tls)
         err =  mailimap_starttls(m_imap);
         if (err != MAILIMAP_NO_ERROR && force_tls) {
-            Global::statusMessage(tr("Server has no TLS support!"));
+            Global::statusMessage(i18n("Server has no TLS support!"));
             try_tls = false;
         } else {
@@ -189,5 +189,5 @@ void IMAPwrapper::login()
             failure="Unknown failure";
          }
-         Global::statusMessage(tr("error connecting imap server: %1").arg(failure));
+         Global::statusMessage(i18n("error connecting imap server: %1").arg(failure));
          mailimap_free( m_imap );
          m_imap = 0;
@@ -201,5 +201,5 @@ void IMAPwrapper::login()
     bool ok = true;
     if (force_tls && !try_tls) {
-        Global::statusMessage(tr("Server has no TLS support!"));
+        Global::statusMessage(i18n("Server has no TLS support!"));
         ok = false;
     }
@@ -211,5 +211,5 @@ void IMAPwrapper::login()
         err = mailimap_login_simple( m_imap, (char*)user.latin1(), (char*)pass.latin1() );
         if ( err != MAILIMAP_NO_ERROR ) {
-            Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
+            Global::statusMessage(i18n("error logging in imap server: %1").arg(m_imap->imap_response));
             ok = false;
         }
@@ -257,12 +257,12 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
 
         if (last == 0) {
-            Global::statusMessage(tr("Mailbox has no mails"));
+            Global::statusMessage(i18n("Mailbox has no mails"));
             return;
         } else {
         }
-        progress( tr("Fetch "));     
+        progress( i18n("Fetch "));     
         mMax = last;
         //qDebug("last %d ", last);
-        Global::statusMessage(tr("Fetching header list"));
+        Global::statusMessage(i18n("Fetching header list"));
         qApp->processEvents();
         /* the range has to start at 1!!! not with 0!!!! */
@@ -300,10 +300,10 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
                 }
             }
-            Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count()));
+            Global::statusMessage(i18n("Mailbox has %1 mails").arg(target.count()));
         } else {
             --tryAgain;
             --tryAgain;//disabled tryagain by adding this line
             if ( tryAgain < 0 )
-                Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
+                Global::statusMessage(i18n("Error fetching headers: %1").arg(m_imap->imap_response));
             else
                 qDebug("try again... ");
@@ -334,5 +334,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
  * it seems like ugly code. and yes - it is ugly code. but the best way.
  */
-    Global::statusMessage(tr("Fetching folder list"));
+    Global::statusMessage(i18n("Fetching folder list"));
     qApp->processEvents();
     QString temp;
@@ -970,11 +970,11 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
     
     mMax = count;
-    progress( tr("Delete")); 
+    progress( i18n("Delete")); 
 
     QProgressBar wid ( count );
-    wid.setCaption( tr("Deleting ..."));
+    wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {
-        Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+        Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
@@ -1004,5 +1004,5 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
         // err = mailimap_expunge(m_imap);
         //if (err != MAILIMAP_NO_ERROR) {
-        //    Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
+        //    Global::statusMessage(i18n("Error deleting mails: %s").arg(m_imap->imap_response));
         // }
         //#endif
@@ -1013,5 +1013,5 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
         err = mailimap_expunge(m_imap);
         if (err != MAILIMAP_NO_ERROR) {
-            Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
+            Global::statusMessage(i18n("Error deleting mails: %s").arg(m_imap->imap_response));
         }
 }
@@ -1047,5 +1047,5 @@ void IMAPwrapper::deleteMail(const RecMailP&mail)
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
-        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+        Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response));
     }
     //qDebug("IMAPwrapper::deleteMail 2");
@@ -1130,5 +1130,5 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
     int last = m_imap->imap_selection_info->sel_exists;
     if (last == 0) {
-        Global::statusMessage(tr("Mailbox has no mails!"));
+        Global::statusMessage(i18n("Mailbox has no mails!"));
         return 0;
     }
@@ -1141,5 +1141,5 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
     mailimap_store_att_flags_free(store_flags);
     if (err != MAILIMAP_NO_ERROR) {
-        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+        Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response));
         return 0;
     }
@@ -1148,5 +1148,5 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
-        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+        Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response));
         return 0;
     }
@@ -1172,5 +1172,5 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
             pre+=delemiter;
         } else {
-            Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre));
+            Global::statusMessage(i18n("Cannot create folder %1 for holding subfolders").arg(pre));
             return 0;
         }
@@ -1179,5 +1179,5 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
     int res = mailimap_create(m_imap,pre.latin1());
     if (res != MAILIMAP_NO_ERROR) {
-        Global::statusMessage(tr("%1").arg(m_imap->imap_response));
+        Global::statusMessage(i18n("%1").arg(m_imap->imap_response));
         return 0;
     }
@@ -1192,5 +1192,5 @@ int IMAPwrapper::deleteMbox(const FolderP&folder)
     int res = mailimap_delete(m_imap,folder->getName());
     if (res != MAILIMAP_NO_ERROR) {
-        Global::statusMessage(tr("%1").arg(m_imap->imap_response));
+        Global::statusMessage(i18n("%1").arg(m_imap->imap_response));
         return 0;
     }
@@ -1275,5 +1275,5 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
     if (targetWrapper != this || maxSizeInKb > 0 ) { 
         mMax = 0;
-        progress( tr("Copy"));
+        progress( i18n("Copy"));
         AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb);
         //qDebug("IMAPwrapper::mvcpAllMails::Using generic");
@@ -1290,5 +1290,5 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
         return;
     }
-    Global::statusMessage( tr("Copying mails on server...") );
+    Global::statusMessage( i18n("Copying mails on server...") );
     int last = m_imap->imap_selection_info->sel_exists;
     set = mailimap_set_new_interval( 1, last );
@@ -1296,5 +1296,5 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
     mailimap_set_free( set );
     if ( err != MAILIMAP_NO_ERROR ) {
-        QString error_msg = tr("Error copy mails: %1").arg(m_imap->imap_response);
+        QString error_msg = i18n("Error copy mails: %1").arg(m_imap->imap_response);
         Global::statusMessage(error_msg);
         // odebug << error_msg << oendl; 
@@ -1326,5 +1326,5 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra
     mailimap_set_free( set );
     if ( err != MAILIMAP_NO_ERROR ) {
-        QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response);
+        QString error_msg = i18n("error copy mail: %1").arg(m_imap->imap_response);
         Global::statusMessage(error_msg);
         // odebug << error_msg << oendl; 
diff --git a/kmicromail/libmailwrapper/mboxwrapper.cpp b/kmicromail/libmailwrapper/mboxwrapper.cpp
index 39dd156..0cdbae4 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.cpp
+++ b/kmicromail/libmailwrapper/mboxwrapper.cpp
@@ -5,4 +5,5 @@
 #include <qdir.h>
 #include <stdlib.h>
+#include <klocale.h>
 
 
@@ -45,5 +46,5 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
     mailfolder_free(folder);
     mailstorage_free(storage);
-    Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count()));
+    Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count()));
 }
 
@@ -144,10 +145,10 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b
     QFileInfo fi(p);
     if (fi.exists()) {
-        Global::statusMessage(tr("Mailbox exists."));
+        Global::statusMessage(i18n("Mailbox exists."));
         return 0;
     }
     mailmbox_folder*f = 0;
     if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error init folder"));
+        Global::statusMessage(i18n("Error init folder"));
         return 0;
     }
@@ -163,10 +164,10 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde
     int r = mailmbox_init(p.latin1(),0,1,0,&f);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error init folder"));
+        Global::statusMessage(i18n("Error init folder"));
         return;
     }
     r = mailmbox_append_message(f,msg,length);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error writing to message folder"));
+        Global::statusMessage(i18n("Error writing to message folder"));
     }
     mailmbox_done(f);
@@ -188,5 +189,5 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
     r = mailfolder_connect(folder);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error initializing mbox"));
+        Global::statusMessage(i18n("Error initializing mbox"));
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -195,5 +196,5 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
     r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber()));
+        Global::statusMessage(i18n("Error fetching mail %i").arg(mail->getNumber()));
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -202,5 +203,5 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
     r = mailmessage_fetch(msg,&data,&size);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber()));
+        Global::statusMessage(i18n("Error fetching mail %i").arg(mail->getNumber()));
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -258,5 +259,5 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
     int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error initializing mbox"));
+        Global::statusMessage(i18n("Error initializing mbox"));
         res = 0;
     }
@@ -265,5 +266,5 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
         r = mailfolder_connect(folder);
         if (r != MAIL_NO_ERROR) {
-            Global::statusMessage(tr("Error initializing mbox"));
+            Global::statusMessage(i18n("Error initializing mbox"));
             res = 0;
         }
@@ -279,5 +280,5 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
         r = mailsession_remove_message(folder->fld_session,i+1);
         if (r != MAIL_NO_ERROR) {
-            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            Global::statusMessage(i18n("Error deleting mail %1").arg(i+1));
             res = 0;
             break;
@@ -296,9 +297,9 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder)
     QFile fi(p);
     if (!fi.exists()) {
-        Global::statusMessage(tr("Mailbox doesn't exist."));
+        Global::statusMessage(i18n("Mailbox doesn't exist."));
         return 0;
     }
     if (!fi.remove()) {
-        Global::statusMessage(tr("Error deleting Mailbox."));
+        Global::statusMessage(i18n("Error deleting Mailbox."));
         return 0;
     }
@@ -316,5 +317,5 @@ void MBOXwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
     QFile fi(p);
     if (!fi.exists()) {
-        Global::statusMessage(tr("Mailbox doesn't exist."));
+        Global::statusMessage(i18n("Mailbox doesn't exist."));
         return;
     }
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 9d52f52..2888f7c 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -6,4 +6,5 @@
 #include <libetpan/libetpan.h>
 
+#include <klocale.h>
 
 #include <qpe/global.h>
@@ -108,5 +109,5 @@ void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPoi
     mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
     parseList(target,m_pop3->sto_session,"INBOX", false, maxSizeInKb);
-    Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
+    Global::statusMessage( i18n("Mailbox contains %1 mail(s)").arg(res_messages));
 }
 
@@ -166,5 +167,5 @@ void POP3wrapper::login()
     if (err != MAIL_NO_ERROR) {
         ; // odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl; 
-        Global::statusMessage(tr("Error %1 initializing folder").arg( err ));
+        Global::statusMessage(i18n("Error %1 initializing folder").arg( err ));
         mailstorage_free(m_pop3);
         m_pop3 = 0;
@@ -203,8 +204,8 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
 
     QProgressBar wid ( count );
-    wid.setCaption( tr("Deleting ..."));
+    wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {  
-        Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+        Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
@@ -214,5 +215,5 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
         int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
         if (err != MAIL_NO_ERROR) {
-            Global::statusMessage(tr("Error deleting mail"));
+            Global::statusMessage(i18n("Error deleting mail"));
         }
         ++iii;
@@ -225,5 +226,5 @@ void POP3wrapper::deleteMail(const RecMailP&mail) {
     int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
     if (err != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("error deleting mail"));
+        Global::statusMessage(i18n("error deleting mail"));
     }
 }
@@ -240,5 +241,5 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
     int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result);
     if (err != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error getting folder info"));
+        Global::statusMessage(i18n("Error getting folder info"));
         return 0;
     }
@@ -247,8 +248,8 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
 
     QProgressBar wid ( result );
-    wid.setCaption( tr("Deleting ..."));
+    wid.setCaption( i18n("Deleting ..."));
     wid.show();
     for (unsigned int i = 0; i < result; ++i) { 
-        Global::statusMessage(tr("Delete message %1 of %2").arg(i).arg(result));
+        Global::statusMessage(i18n("Delete message %1 of %2").arg(i).arg(result));
         wid.setProgress( i ); 
         wid.raise();
@@ -257,5 +258,5 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
         err = mailsession_remove_message(m_pop3->sto_session,i+1);
         if (err != MAIL_NO_ERROR) {
-            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            Global::statusMessage(i18n("Error deleting mail %1").arg(i+1));
             res=0;
         }
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index d5a528c..dee1477 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -15,4 +15,5 @@
 
 #include <libetpan/libetpan.h>
+#include <klocale.h>
 
 
@@ -45,41 +46,41 @@ QString SMTPwrapper::mailsmtpError( int errnum ) {
     switch ( errnum ) {
     case MAILSMTP_NO_ERROR:
-        return tr( "No error" );
+        return i18n( "No error" );
     case MAILSMTP_ERROR_UNEXPECTED_CODE:
-        return tr( "Unexpected error code" );
+        return i18n( "Unexpected error code" );
     case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
-        return tr( "Service not available" );
+        return i18n( "Service not available" );
     case MAILSMTP_ERROR_STREAM:
-        return tr( "Stream error" );
+        return i18n( "Stream error" );
     case MAILSMTP_ERROR_HOSTNAME:
-        return tr( "gethostname() failed" );
+        return i18n( "gethostname() failed" );
     case MAILSMTP_ERROR_NOT_IMPLEMENTED:
-        return tr( "Not implemented" );
+        return i18n( "Not implemented" );
     case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
-        return tr( "Error, action not taken" );
+        return i18n( "Error, action not taken" );
     case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
-        return tr( "Data exceeds storage allocation" );
+        return i18n( "Data exceeds storage allocation" );
     case MAILSMTP_ERROR_IN_PROCESSING:
-        return tr( "Error in processing" );
+        return i18n( "Error in processing" );
     case MAILSMTP_ERROR_STARTTLS_NOT_SUPPORTED:
-        return tr( "Starttls not supported" );
+        return i18n( "Starttls not supported" );
         //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
-        //        return tr( "Insufficient system storage" );
+        //        return i18n( "Insufficient system storage" );
     case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
-        return tr( "Mailbox unavailable" );
+        return i18n( "Mailbox unavailable" );
     case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
-        return tr( "Mailbox name not allowed" );
+        return i18n( "Mailbox name not allowed" );
     case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
-        return tr( "Bad command sequence" );
+        return i18n( "Bad command sequence" );
     case MAILSMTP_ERROR_USER_NOT_LOCAL:
-        return tr( "User not local" );
+        return i18n( "User not local" );
     case MAILSMTP_ERROR_TRANSACTION_FAILED:
-        return tr( "Transaction failed" );
+        return i18n( "Transaction failed" );
     case MAILSMTP_ERROR_MEMORY:
-        return tr( "Memory error" );
+        return i18n( "Memory error" );
     case MAILSMTP_ERROR_CONNECTION_REFUSED:
-        return tr( "Connection refused" );
+        return i18n( "Connection refused" );
     default:
-        return tr( "Unknown error code" );
+        return i18n( "Unknown error code" );
     }
 }
@@ -153,6 +154,6 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*
     }
     if (failuremessage) {
-        QMessageBox::critical(0,tr("Error sending mail"),
-            tr("<center>%1</center>").arg(failuremessage));
+        QMessageBox::critical(0,i18n("Error sending mail"),
+            i18n("<center>%1</center>").arg(failuremessage));
     }
 }
@@ -222,5 +223,5 @@ void SMTPwrapper::connect_server()
     if ( err != MAILSMTP_NO_ERROR ) {
         ; // odebug << "Error init connection" << oendl; 
-        failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
+        failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err));
         result = 0;
     }
@@ -231,5 +232,5 @@ void SMTPwrapper::connect_server()
         if (err != MAILSMTP_NO_ERROR) {
             result = 0;
-            failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
+            failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err));
         }
     }
@@ -246,5 +247,5 @@ void SMTPwrapper::connect_server()
     if (!try_tls && force_tls) {
         result = 0;
-        failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err));
+        failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err));
     }
 
@@ -262,5 +263,5 @@ void SMTPwrapper::connect_server()
             } else {
                 result = 0;
-                failuretext=tr("Login aborted - storing mail to localfolder");
+                failuretext=i18n("Login aborted - storing mail to localfolder");
             }
         } else {
@@ -274,5 +275,5 @@ void SMTPwrapper::connect_server()
                 ; // odebug << "auth ok" << oendl; 
             } else {
-                failuretext = tr("Authentification failed");
+                failuretext = i18n("Authentification failed");
                 result = 0;
             }
@@ -301,5 +302,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
         err = mailsmtp_send( m_smtp, from, rcpts, data, size );
         if ( err != MAILSMTP_NO_ERROR ) {
-            failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err));
+            failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err));
             result = 0;
         }
@@ -434,6 +435,6 @@ bool SMTPwrapper::flushOutbox() {
     while (mailsToSend.count()>0) {
         if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) {
-            QMessageBox::critical(0,tr("Error sending mail"),
-                                  tr("Error sending queued mail - breaking"));
+            QMessageBox::critical(0,i18n("Error sending mail"),
+                                  i18n("Error sending queued mail - breaking"));
             returnValue = false;
             break;