1 files changed, 49 insertions, 48 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 49d86fc..567de87 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -15,6 +15,7 @@
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <kiconloader.h>
+#include <klocale.h>
 
 #define GET_NEW_MAILS 101
 
@@ -92,14 +93,14 @@ QPopupMenu * POP3viewItem::getContextMenu()
     {
         if (!account->getOffline())
         {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Disconnect",contextName),0);
-            m->insertItem(QObject::tr("Set offline",contextName),1);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
+            m->insertItem(i18n("Disconnect"),0);
+            m->insertItem(i18n("Set offline"),1);
         }
         else
         {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Set online",contextName),1);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
+            m->insertItem(i18n("Set online"),1);
         }
     }
     return m;
@@ -187,10 +188,10 @@ QPopupMenu * POP3folderItem::getContextMenu()
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
-        m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
-        m->insertItem(QObject::tr("Refresh header list",contextName),0);
-        m->insertItem(QObject::tr("Delete all mails",contextName),1);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
+        m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
+        m->insertItem(i18n("Refresh header list"),0);
+        m->insertItem(i18n("Delete all mails"),1);
+        m->insertItem(i18n("Move/Copie all mails"),2);
     }
     return m;
 }
@@ -300,13 +301,13 @@ QPopupMenu * NNTPviewItem::getContextMenu()
     {
         if (!account->getOffline())
         {
-            m->insertItem(QObject::tr("Disconnect",contextName),0);
-            m->insertItem(QObject::tr("Set offline",contextName),1);
-            //m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),2);
+            m->insertItem(i18n("Disconnect"),0);
+            m->insertItem(i18n("Set offline"),1);
+            //m->insertItem(i18n("(Un-)Subscribe groups"),2);
         }
         else
         {
-            m->insertItem(QObject::tr("Set online",contextName),1);
+            m->insertItem(i18n("Set online"),1);
         }
     }
     return m;
@@ -396,8 +397,8 @@ QPopupMenu * NNTPfolderItem::getContextMenu()
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
-        m->insertItem(QObject::tr("Refresh header list",contextName),0);
-        m->insertItem(QObject::tr("Copy all postings",contextName),1);
+        m->insertItem(i18n("Refresh header list"),0);
+        m->insertItem(i18n("Copy all postings"),1);
     }
     return m;
 }
@@ -517,18 +518,18 @@ QPopupMenu * IMAPviewItem::getContextMenu()
     {
         if (!account->getOffline())
         {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Refresh folder list",contextName),0);
-            m->insertItem(QObject::tr("Create new folder",contextName),1);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
+            m->insertItem(i18n("Refresh folder list"),0);
+            m->insertItem(i18n("Create new folder"),1);
             m->insertSeparator();
-            m->insertItem(QObject::tr("Disconnect",contextName),2);
-            m->insertItem(QObject::tr("Set offline",contextName),3);
+            m->insertItem(i18n("Disconnect"),2);
+            m->insertItem(i18n("Set offline"),3);
             m->insertSeparator();
         }
         else
         {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Set online",contextName),3);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
+            m->insertItem(i18n("Set online"),3);
         }
     }
     return m;
@@ -672,18 +673,18 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
     {
         if (folder->may_select())
         {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Refresh header list",contextName),0);
-            m->insertItem(QObject::tr("Move/Copie all mails",contextName),4);
-            m->insertItem(QObject::tr("Delete all mails",contextName),1);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
+            m->insertItem(i18n("Refresh header list"),0);
+            m->insertItem(i18n("Move/Copie all mails"),4);
+            m->insertItem(i18n("Delete all mails"),1);
         }
         if (folder->no_inferior()==false)
         {
-            m->insertItem(QObject::tr("Create new subfolder",contextName),2);
+            m->insertItem(i18n("Create new subfolder"),2);
         }
         if (folder->getDisplayName().lower()!="inbox")
         {
-            m->insertItem(QObject::tr("Delete folder",contextName),3);
+            m->insertItem(i18n("Delete folder"),3);
         }
     }
     return m;
@@ -707,10 +708,10 @@ void IMAPfolderItem::createNewFolder()
 
 void IMAPfolderItem::deleteFolder()
 {
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
-                                     QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
-                                     QObject::tr("Yes",contextName),
-                                     QObject::tr("No",contextName),QString::null,1,1);
+    int yesno = QMessageBox::warning(0,i18n("Delete folder"),
+                                     i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
+                                     i18n("Yes"),
+                                     i18n("No"),QString::null,1,1);
    
     if (yesno == 0)
     {
@@ -857,10 +858,10 @@ QPopupMenu * MHviewItem::getContextMenu()
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
-        m->insertItem(QObject::tr("Refresh folder list",contextName),0);
-        m->insertItem(QObject::tr("Create new folder",contextName),1);
-        m->insertItem(QObject::tr("Delete all mails",contextName),2);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),3);
+        m->insertItem(i18n("Refresh folder list"),0);
+        m->insertItem(i18n("Create new folder"),1);
+        m->insertItem(i18n("Delete all mails"),2);
+        m->insertItem(i18n("Move/Copie all mails"),3);
     }
     return m;
 }
@@ -975,10 +976,10 @@ RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
 
 void MHfolderItem::deleteFolder()
 {
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
-                                     QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
-                                     QObject::tr("Yes",contextName),
-                                     QObject::tr("No",contextName),QString::null,1,1);
+    int yesno = QMessageBox::warning(0,i18n("Delete folder"),
+                                     i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
+                                     i18n("Yes"),
+                                     i18n("No"),QString::null,1,1);
   
     if (yesno == 0)
     {
@@ -1002,10 +1003,10 @@ QPopupMenu * MHfolderItem::getContextMenu()
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
-        m->insertItem(QObject::tr("Delete all mails",contextName),0);
-        m->insertItem(QObject::tr("Create new subfolder",contextName),3);
-        m->insertItem(QObject::tr("Delete folder",contextName),1);
+        m->insertItem(i18n("Move/Copie all mails"),2);
+        m->insertItem(i18n("Delete all mails"),0);
+        m->insertItem(i18n("Create new subfolder"),3);
+        m->insertItem(i18n("Delete folder"),1);
     }
     return m;
 }
@@ -1117,11 +1118,11 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
     if (!wrapper) return;
     QString fname="";
     if (folder) fname = folder->getDisplayName();
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
-                                     QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
+    int yesno = QMessageBox::warning(0,i18n("Delete all mails"),
+                                     i18n("<center>Realy delete all mails in box <br>%1</center>").
                                      arg(fname),
-                                     QObject::tr("Yes",contextName),
-                                     QObject::tr("No",contextName),QString::null,1,1);
+                                     i18n("Yes"),
+                                     i18n("No"),QString::null,1,1);
  
     if (yesno == 0)
     {