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
@@ -9,4 +9,5 @@
 #include <qpe/global.h>
 #include <oprocess.h>
+#include <klocale.h>
 //#include <opie2/odebug.h>
 
@@ -77,5 +78,5 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
     }
     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()));
 }
 
@@ -233,10 +234,10 @@ 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;
@@ -291,5 +292,5 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder)
         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;
@@ -345,5 +346,5 @@ 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;
 }
@@ -362,5 +363,5 @@ void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
             &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
@@ -2,4 +2,5 @@
 #include <qprogressbar.h>
 #include <qlabel.h>
+#include <klocale.h>
 
 progressMailSend::progressMailSend(QWidget*parent, const char * name)
@@ -35,5 +36,5 @@ 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);
@@ -43,5 +44,5 @@ 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
@@ -46,4 +46,5 @@ int main( int argc,  char **argv ) {
 #endif 
     KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail")));
+    KPimGlobalPrefs::instance()->setGlobalConfig();
     OpieMail  mw;
 #ifndef DESKTOP_VERSION
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3aa7905..a32983c 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -35,5 +35,4 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
 {
     settings = new Settings();
-    KPimGlobalPrefs::instance()->setGlobalConfig();
 
     folderView->populate( settings->getAccounts() );