| -rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 22 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 58 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/mboxwrapper.cpp | 29 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/pop3wrapper.cpp | 21 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 59 |
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 @@ -13,3 +13,3 @@ #include <qmessagebox.h> - +#include <klocale.h> #include <kdecore/kstandarddirs.h> @@ -149,6 +149,6 @@ void AbstractMail::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 ); @@ -174,4 +174,4 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe { - 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; @@ -182,3 +182,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe 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; @@ -212,3 +212,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe if ( n.count() == 0 ) { - Global::statusMessage(tr("There are no new messages")); + Global::statusMessage(i18n("There are no new messages")); return; @@ -216,3 +216,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer()); - Global::statusMessage(tr("Downloaded %1 messages").arg(n.count())); + Global::statusMessage(i18n("Downloaded %1 messages").arg(n.count())); @@ -242,9 +242,9 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, // 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 ); 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 @@ -50,3 +50,3 @@ 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() @@ -68,4 +68,4 @@ void IMAPwrapper::progress( QString m ) //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); @@ -102,3 +102,3 @@ bool IMAPwrapper::start_tls(bool force_tls) 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; @@ -190,3 +190,3 @@ void IMAPwrapper::login() } - Global::statusMessage(tr("error connecting imap server: %1").arg(failure)); + Global::statusMessage(i18n("error connecting imap server: %1").arg(failure)); mailimap_free( m_imap ); @@ -202,3 +202,3 @@ void IMAPwrapper::login() if (force_tls && !try_tls) { - Global::statusMessage(tr("Server has no TLS support!")); + Global::statusMessage(i18n("Server has no TLS support!")); ok = false; @@ -212,3 +212,3 @@ void IMAPwrapper::login() 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; @@ -258,3 +258,3 @@ 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; @@ -262,6 +262,6 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma } - 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(); @@ -301,3 +301,3 @@ 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 { @@ -306,3 +306,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma 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 @@ -335,3 +335,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() */ - Global::statusMessage(tr("Fetching folder list")); + Global::statusMessage(i18n("Fetching folder list")); qApp->processEvents(); @@ -971,9 +971,9 @@ 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 ); @@ -1005,3 +1005,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) //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)); // } @@ -1014,3 +1014,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) 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)); } @@ -1048,3 +1048,3 @@ void IMAPwrapper::deleteMail(const RecMailP&mail) 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)); } @@ -1131,3 +1131,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) if (last == 0) { - Global::statusMessage(tr("Mailbox has no mails!")); + Global::statusMessage(i18n("Mailbox has no mails!")); return 0; @@ -1142,3 +1142,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) 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; @@ -1149,3 +1149,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) 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; @@ -1173,3 +1173,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons } 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; @@ -1180,3 +1180,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons 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; @@ -1193,3 +1193,3 @@ int IMAPwrapper::deleteMbox(const FolderP&folder) 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; @@ -1276,3 +1276,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, mMax = 0; - progress( tr("Copy")); + progress( i18n("Copy")); AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb); @@ -1291,3 +1291,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, } - Global::statusMessage( tr("Copying mails on server...") ); + Global::statusMessage( i18n("Copying mails on server...") ); int last = m_imap->imap_selection_info->sel_exists; @@ -1297,3 +1297,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, 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); @@ -1327,3 +1327,3 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra 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); 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 @@ -6,2 +6,3 @@ #include <stdlib.h> +#include <klocale.h> @@ -46,3 +47,3 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta 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())); } @@ -145,3 +146,3 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b if (fi.exists()) { - Global::statusMessage(tr("Mailbox exists.")); + Global::statusMessage(i18n("Mailbox exists.")); return 0; @@ -150,3 +151,3 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b 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; @@ -164,3 +165,3 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde if (r != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error init folder")); + Global::statusMessage(i18n("Error init folder")); return; @@ -169,3 +170,3 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde if (r != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error writing to message folder")); + Global::statusMessage(i18n("Error writing to message folder")); } @@ -189,3 +190,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) if (r != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error initializing mbox")); + Global::statusMessage(i18n("Error initializing mbox")); mailfolder_free(folder); @@ -196,3 +197,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) 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); @@ -203,3 +204,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) 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); @@ -259,3 +260,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) if (r != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error initializing mbox")); + Global::statusMessage(i18n("Error initializing mbox")); res = 0; @@ -266,3 +267,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) if (r != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error initializing mbox")); + Global::statusMessage(i18n("Error initializing mbox")); res = 0; @@ -280,3 +281,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) 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; @@ -297,3 +298,3 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder) if (!fi.exists()) { - Global::statusMessage(tr("Mailbox doesn't exist.")); + Global::statusMessage(i18n("Mailbox doesn't exist.")); return 0; @@ -301,3 +302,3 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder) if (!fi.remove()) { - Global::statusMessage(tr("Error deleting Mailbox.")); + Global::statusMessage(i18n("Error deleting Mailbox.")); return 0; @@ -317,3 +318,3 @@ void MBOXwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) 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 @@ -7,2 +7,3 @@ +#include <klocale.h> @@ -109,3 +110,3 @@ void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPoi 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)); } @@ -167,3 +168,3 @@ void POP3wrapper::login() ; // 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); @@ -204,6 +205,6 @@ 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 ); @@ -215,3 +216,3 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target) if (err != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error deleting mail")); + Global::statusMessage(i18n("Error deleting mail")); } @@ -226,3 +227,3 @@ void POP3wrapper::deleteMail(const RecMailP&mail) { if (err != MAIL_NO_ERROR) { - Global::statusMessage(tr("error deleting mail")); + Global::statusMessage(i18n("error deleting mail")); } @@ -241,3 +242,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) { if (err != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error getting folder info")); + Global::statusMessage(i18n("Error getting folder info")); return 0; @@ -248,6 +249,6 @@ 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 ); @@ -258,3 +259,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) { 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 @@ -16,2 +16,3 @@ #include <libetpan/libetpan.h> +#include <klocale.h> @@ -46,39 +47,39 @@ QString SMTPwrapper::mailsmtpError( int 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" ); } @@ -154,4 +155,4 @@ 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)); } @@ -223,3 +224,3 @@ void SMTPwrapper::connect_server() ; // 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; @@ -232,3 +233,3 @@ void SMTPwrapper::connect_server() result = 0; - failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); + failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); } @@ -247,3 +248,3 @@ void SMTPwrapper::connect_server() result = 0; - failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); + failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err)); } @@ -263,3 +264,3 @@ void SMTPwrapper::connect_server() result = 0; - failuretext=tr("Login aborted - storing mail to localfolder"); + failuretext=i18n("Login aborted - storing mail to localfolder"); } @@ -275,3 +276,3 @@ void SMTPwrapper::connect_server() } else { - failuretext = tr("Authentification failed"); + failuretext = i18n("Authentification failed"); result = 0; @@ -302,3 +303,3 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t 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; @@ -435,4 +436,4 @@ bool SMTPwrapper::flushOutbox() { 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; |