kopimail translation

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
@@ -5,12 +5,13 @@
 #include <libetpan/libetpan.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 #include <stdlib.h>
 #include <qpe/global.h>
 #include <oprocess.h>
+#include <klocale.h>
 //#include <opie2/odebug.h>
 
 using namespace Opie::Core;
 MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
     : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name)
 {
@@ -73,13 +74,13 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
     int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
     if (r!=MAIL_NO_ERROR) {
         qDebug("listMessages: error selecting folder! ");
         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()
 {
     QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
     /* this is needed! */
@@ -229,18 +230,18 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
     if (r!=MAIL_NO_ERROR) {
         qDebug("error selecting folder! ");
         return result;
     }
     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;
     }
     result = new encodedString(data,size);
     if (msg) mailmessage_free(msg);
     return result;
@@ -287,13 +288,13 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder)
     for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) {
         mailmessage * msg;
         msg = (mailmessage*)carray_get(l->msg_tab, i);
         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;
         }
     }
     if (l) mailmessage_list_free(l);
     return res;
@@ -341,13 +342,13 @@ void MHwrapper::processEnded(OProcess *p)
     if (p) delete 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;
 }
 
 void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
 {
     init_storage();
@@ -358,13 +359,13 @@ void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
     target_stat.message_unseen = 0;
     target_stat.message_recent = 0;
     QString f = buildPath(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"));
     }
 }
 
 MAILLIB::ATYPE MHwrapper::getType()const
 {
     return MAILLIB::A_MH;
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,9 +1,10 @@
 #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)
 {
 }
 
@@ -31,17 +32,17 @@ void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax)
     m_max_single = aMax;
     setSingle();
 }
 
 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);
 }
 
 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
@@ -42,12 +42,13 @@ int main( int argc,  char **argv ) {
         KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/");
 #else
     fileName  = qApp->applicationDirPath () + "/kdepim/kopiemail/";
     KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 #endif 
     KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail")));
+    KPimGlobalPrefs::instance()->setGlobalConfig();
     OpieMail  mw;
 #ifndef DESKTOP_VERSION
     //qDebug("CONNECT ");
     QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message(  const QCString&, const QByteArray& ))); 
     // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
     a.showMainWidget(&mw );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3aa7905..a32983c 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -31,13 +31,12 @@
 //using namespace Opie::Core;
 
 OpieMail::OpieMail( QWidget *parent, const char *name )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
     settings = new Settings();
-    KPimGlobalPrefs::instance()->setGlobalConfig();
 
     folderView->populate( settings->getAccounts() );
   
 }
 
 OpieMail::~OpieMail()