| -rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.cpp | 13 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/sendmailprogress.cpp | 5 | ||||
| -rw-r--r-- | kmicromail/main.cpp | 1 | ||||
| -rw-r--r-- | kmicromail/opiemail.cpp | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp index 641d4d9..f4133c0 100644 --- a/kmicromail/libmailwrapper/mhwrapper.cpp +++ b/kmicromail/libmailwrapper/mhwrapper.cpp @@ -8,6 +8,7 @@ #include <stdlib.h> #include <qpe/global.h> #include <oprocess.h> +#include <klocale.h> //#include <opie2/odebug.h> using namespace Opie::Core; @@ -76,7 +77,7 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm return; } parseList(target,m_storage->sto_session,f, false, maxSizeInKb ); - Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); + Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count())); } QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() @@ -232,12 +233,12 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail) } r = mailsession_get_message(m_storage->sto_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())); return 0; } 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())); if (msg) mailmessage_free(msg); return 0; } @@ -290,7 +291,7 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder) j = msg->msg_index; r = mailsession_remove_message(m_storage->sto_session,j); 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; } @@ -344,7 +345,7 @@ void MHwrapper::processEnded(OProcess *p) void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) { QString lineStr = buffer; - QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); + QMessageBox::warning( 0, i18n("Error"), lineStr ,i18n("Ok") ); removeMboxfailed = true; } @@ -361,7 +362,7 @@ void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) int r = mailsession_status_folder(m_storage->sto_session,(char*)f.latin1(),&target_stat.message_count, &target_stat.message_recent,&target_stat.message_unseen); if (r != MAIL_NO_ERROR) { - Global::statusMessage(tr("Error retrieving status")); + Global::statusMessage(i18n("Error retrieving status")); } } diff --git a/kmicromail/libmailwrapper/sendmailprogress.cpp b/kmicromail/libmailwrapper/sendmailprogress.cpp index dc0c75a..20dfe9b 100644 --- a/kmicromail/libmailwrapper/sendmailprogress.cpp +++ b/kmicromail/libmailwrapper/sendmailprogress.cpp @@ -1,6 +1,7 @@ #include "sendmailprogress.h" #include <qprogressbar.h> #include <qlabel.h> +#include <klocale.h> progressMailSend::progressMailSend(QWidget*parent, const char * name) :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0) @@ -34,7 +35,7 @@ void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax) void progressMailSend::setSingle() { - QString text = QString(tr("%1 of %2 bytes send")).arg(m_current_single).arg(m_max_single); + QString text = QString(i18n("%1 of %2 bytes send")).arg(m_current_single).arg(m_max_single); singleMailLabel->setText(text); singleMailProgressBar->setTotalSteps(m_max_single); singleMailProgressBar->setProgress(m_current_single); @@ -42,6 +43,6 @@ void progressMailSend::setSingle() void progressMailSend::setMails() { - QString text = QString(tr("Sending mail %1 of %2")).arg(m_current_mail+1).arg(m_max_mail); + QString text = QString(i18n("Sending mail %1 of %2")).arg(m_current_mail+1).arg(m_max_mail); allMailLabel->setText(text); } diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index 8341c5a..006390c 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp @@ -45,6 +45,7 @@ int main( int argc, char **argv ) { KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); #endif KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); + KPimGlobalPrefs::instance()->setGlobalConfig(); OpieMail mw; #ifndef DESKTOP_VERSION //qDebug("CONNECT "); diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 3aa7905..a32983c 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -34,7 +34,6 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) : MainWindow( parent, name) //, WStyle_ContextHelp ) { settings = new Settings(); - KPimGlobalPrefs::instance()->setGlobalConfig(); folderView->populate( settings->getAccounts() ); |