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
@@ -10,2 +10,3 @@
 #include <oprocess.h>
+#include <klocale.h>
 //#include <opie2/odebug.h>
@@ -78,3 +79,3 @@ 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()));
 }
@@ -234,3 +235,3 @@ encodedString* MHwrapper::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()));
         return 0;
@@ -239,3 +240,3 @@ encodedString* MHwrapper::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()));
         if (msg) mailmessage_free(msg);
@@ -292,3 +293,3 @@ int MHwrapper::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;
@@ -346,3 +347,3 @@ 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;
@@ -363,3 +364,3 @@ void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
     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
@@ -3,2 +3,3 @@
 #include <qlabel.h>
+#include <klocale.h>
 
@@ -36,3 +37,3 @@ 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);
@@ -44,3 +45,3 @@ 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
@@ -47,2 +47,3 @@ int main( int argc,  char **argv ) {
     KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail")));
+    KPimGlobalPrefs::instance()->setGlobalConfig();
     OpieMail  mw;
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3aa7905..a32983c 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -36,3 +36,2 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
     settings = new Settings();
-    KPimGlobalPrefs::instance()->setGlobalConfig();