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
@@ -16,4 +16,5 @@
 #include <qmessagebox.h>
 #include <kiconloader.h>
+#include <klocale.h>
 #define GET_NEW_MAILS 101
@@ -93,12 +94,12 @@ QPopupMenu * POP3viewItem::getContextMenu()
        if (!account->getOffline())
        {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Disconnect",contextName),0);
+            m->insertItem(i18n("Disconnect"),0);
-            m->insertItem(QObject::tr("Set offline",contextName),1);
+            m->insertItem(i18n("Set offline"),1);
        }
        else
        {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Set online",contextName),1);
+            m->insertItem(i18n("Set online"),1);
        }
    }
@@ -188,8 +189,8 @@ QPopupMenu * POP3folderItem::getContextMenu()
    if (m)
    {
-        m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+        m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
-        m->insertItem(QObject::tr("Refresh header list",contextName),0);
+        m->insertItem(i18n("Refresh header list"),0);
-        m->insertItem(QObject::tr("Delete all mails",contextName),1);
+        m->insertItem(i18n("Delete all mails"),1);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
+        m->insertItem(i18n("Move/Copie all mails"),2);
    }
    return m;
@@ -301,11 +302,11 @@ QPopupMenu * NNTPviewItem::getContextMenu()
        if (!account->getOffline())
        {
-            m->insertItem(QObject::tr("Disconnect",contextName),0);
+            m->insertItem(i18n("Disconnect"),0);
-            m->insertItem(QObject::tr("Set offline",contextName),1);
+            m->insertItem(i18n("Set offline"),1);
-            //m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),2);
+            //m->insertItem(i18n("(Un-)Subscribe groups"),2);
        }
        else
        {
-            m->insertItem(QObject::tr("Set online",contextName),1);
+            m->insertItem(i18n("Set online"),1);
        }
    }
@@ -397,6 +398,6 @@ QPopupMenu * NNTPfolderItem::getContextMenu()
    if (m)
    {
-        m->insertItem(QObject::tr("Refresh header list",contextName),0);
+        m->insertItem(i18n("Refresh header list"),0);
-        m->insertItem(QObject::tr("Copy all postings",contextName),1);
+        m->insertItem(i18n("Copy all postings"),1);
    }
    return m;
@@ -518,16 +519,16 @@ QPopupMenu * IMAPviewItem::getContextMenu()
        if (!account->getOffline())
        {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Refresh folder list",contextName),0);
+            m->insertItem(i18n("Refresh folder list"),0);
-            m->insertItem(QObject::tr("Create new folder",contextName),1);
+            m->insertItem(i18n("Create new folder"),1);
            m->insertSeparator();
-            m->insertItem(QObject::tr("Disconnect",contextName),2);
+            m->insertItem(i18n("Disconnect"),2);
-            m->insertItem(QObject::tr("Set offline",contextName),3);
+            m->insertItem(i18n("Set offline"),3);
            m->insertSeparator();
        }
        else
        {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Set online",contextName),3);
+            m->insertItem(i18n("Set online"),3);
        }
    }
@@ -673,16 +674,16 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
        if (folder->may_select())
        {
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
-            m->insertItem(QObject::tr("Refresh header list",contextName),0);
+            m->insertItem(i18n("Refresh header list"),0);
-            m->insertItem(QObject::tr("Move/Copie all mails",contextName),4);
+            m->insertItem(i18n("Move/Copie all mails"),4);
-            m->insertItem(QObject::tr("Delete all mails",contextName),1);
+            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);
        }
    }
@@ -708,8 +709,8 @@ void IMAPfolderItem::createNewFolder()
 void IMAPfolderItem::deleteFolder()
 {
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
+    int yesno = QMessageBox::warning(0,i18n("Delete folder"),
-                                     QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+                                     i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
-                                     QObject::tr("Yes",contextName),
+                                     i18n("Yes"),
-                                     QObject::tr("No",contextName),QString::null,1,1);
+                                     i18n("No"),QString::null,1,1);
   
    if (yesno == 0)
@@ -858,8 +859,8 @@ QPopupMenu * MHviewItem::getContextMenu()
    if (m)
    {
-        m->insertItem(QObject::tr("Refresh folder list",contextName),0);
+        m->insertItem(i18n("Refresh folder list"),0);
-        m->insertItem(QObject::tr("Create new folder",contextName),1);
+        m->insertItem(i18n("Create new folder"),1);
-        m->insertItem(QObject::tr("Delete all mails",contextName),2);
+        m->insertItem(i18n("Delete all mails"),2);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),3);
+        m->insertItem(i18n("Move/Copie all mails"),3);
    }
    return m;
@@ -976,8 +977,8 @@ RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
 void MHfolderItem::deleteFolder()
 {
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
+    int yesno = QMessageBox::warning(0,i18n("Delete folder"),
-                                     QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+                                     i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
-                                     QObject::tr("Yes",contextName),
+                                     i18n("Yes"),
-                                     QObject::tr("No",contextName),QString::null,1,1);
+                                     i18n("No"),QString::null,1,1);
  
    if (yesno == 0)
@@ -1003,8 +1004,8 @@ QPopupMenu * MHfolderItem::getContextMenu()
    if (m)
    {
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
+        m->insertItem(i18n("Move/Copie all mails"),2);
-        m->insertItem(QObject::tr("Delete all mails",contextName),0);
+        m->insertItem(i18n("Delete all mails"),0);
-        m->insertItem(QObject::tr("Create new subfolder",contextName),3);
+        m->insertItem(i18n("Create new subfolder"),3);
-        m->insertItem(QObject::tr("Delete folder",contextName),1);
+        m->insertItem(i18n("Delete folder"),1);
    }
    return m;
@@ -1118,9 +1119,9 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
    QString fname="";
    if (folder) fname = folder->getDisplayName();
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
+    int yesno = QMessageBox::warning(0,i18n("Delete all mails"),
-                                     QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
+                                     i18n("<center>Realy delete all mails in box <br>%1</center>").
                                     arg(fname),
-                                     QObject::tr("Yes",contextName),
+                                     i18n("Yes"),
-                                     QObject::tr("No",contextName),QString::null,1,1);
+                                     i18n("No"),QString::null,1,1);
 
    if (yesno == 0)

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp index 49d86fc..567de87 100644 --- a/kmicromail/accountitem.cpp +++ b/kmicromail/accountitem.cpp
@@ -16,4 +16,5 @@
16	#include <qmessagebox.h>	16	#include <qmessagebox.h>
17	#include <kiconloader.h>	17	#include <kiconloader.h>
		18	#include <klocale.h>
18		19
19	#define GET_NEW_MAILS 101	20	#define GET_NEW_MAILS 101
@@ -93,12 +94,12 @@ QPopupMenu * POP3viewItem::getContextMenu()
93	if (!account->getOffline())	94	if (!account->getOffline())
94	{	95	{
95	m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);	96	m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
96	m->insertItem(QObject::tr("Disconnect",contextName),0);	97	m->insertItem(i18n("Disconnect"),0);
97	m->insertItem(QObject::tr("Set offline",contextName),1);	98	m->insertItem(i18n("Set offline"),1);
98	}	99	}
99	else	100	else
100	{	101	{
101	m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);	102	m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
102	m->insertItem(QObject::tr("Set online",contextName),1);	103	m->insertItem(i18n("Set online"),1);
103	}	104	}
104	}	105	}
@@ -188,8 +189,8 @@ QPopupMenu * POP3folderItem::getContextMenu()
188	if (m)	189	if (m)
189	{	190	{
190	m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);	191	m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
191	m->insertItem(QObject::tr("Refresh header list",contextName),0);	192	m->insertItem(i18n("Refresh header list"),0);
192	m->insertItem(QObject::tr("Delete all mails",contextName),1);	193	m->insertItem(i18n("Delete all mails"),1);
193	m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);	194	m->insertItem(i18n("Move/Copie all mails"),2);
194	}	195	}
195	return m;	196	return m;
@@ -301,11 +302,11 @@ QPopupMenu * NNTPviewItem::getContextMenu()
301	if (!account->getOffline())	302	if (!account->getOffline())
302	{	303	{
303	m->insertItem(QObject::tr("Disconnect",contextName),0);	304	m->insertItem(i18n("Disconnect"),0);
304	m->insertItem(QObject::tr("Set offline",contextName),1);	305	m->insertItem(i18n("Set offline"),1);
305	//m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),2);	306	//m->insertItem(i18n("(Un-)Subscribe groups"),2);
306	}	307	}
307	else	308	else
308	{	309	{
309	m->insertItem(QObject::tr("Set online",contextName),1);	310	m->insertItem(i18n("Set online"),1);
310	}	311	}
311	}	312	}
@@ -397,6 +398,6 @@ QPopupMenu * NNTPfolderItem::getContextMenu()
397	if (m)	398	if (m)
398	{	399	{
399	m->insertItem(QObject::tr("Refresh header list",contextName),0);	400	m->insertItem(i18n("Refresh header list"),0);
400	m->insertItem(QObject::tr("Copy all postings",contextName),1);	401	m->insertItem(i18n("Copy all postings"),1);
401	}	402	}
402	return m;	403	return m;
@@ -518,16 +519,16 @@ QPopupMenu * IMAPviewItem::getContextMenu()
518	if (!account->getOffline())	519	if (!account->getOffline())
519	{	520	{
520	m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);	521	m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
521	m->insertItem(QObject::tr("Refresh folder list",contextName),0);	522	m->insertItem(i18n("Refresh folder list"),0);
522	m->insertItem(QObject::tr("Create new folder",contextName),1);	523	m->insertItem(i18n("Create new folder"),1);
523	m->insertSeparator();	524	m->insertSeparator();
524	m->insertItem(QObject::tr("Disconnect",contextName),2);	525	m->insertItem(i18n("Disconnect"),2);
525	m->insertItem(QObject::tr("Set offline",contextName),3);	526	m->insertItem(i18n("Set offline"),3);
526	m->insertSeparator();	527	m->insertSeparator();
527	}	528	}
528	else	529	else
529	{	530	{
530	m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);	531	m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
531	m->insertItem(QObject::tr("Set online",contextName),3);	532	m->insertItem(i18n("Set online"),3);
532	}	533	}
533	}	534	}
@@ -673,16 +674,16 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
673	if (folder->may_select())	674	if (folder->may_select())
674	{	675	{
675	m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);	676	m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
676	m->insertItem(QObject::tr("Refresh header list",contextName),0);	677	m->insertItem(i18n("Refresh header list"),0);
677	m->insertItem(QObject::tr("Move/Copie all mails",contextName),4);	678	m->insertItem(i18n("Move/Copie all mails"),4);
678	m->insertItem(QObject::tr("Delete all mails",contextName),1);	679	m->insertItem(i18n("Delete all mails"),1);
679	}	680	}
680	if (folder->no_inferior()==false)	681	if (folder->no_inferior()==false)
681	{	682	{
682	m->insertItem(QObject::tr("Create new subfolder",contextName),2);	683	m->insertItem(i18n("Create new subfolder"),2);
683	}	684	}
684	if (folder->getDisplayName().lower()!="inbox")	685	if (folder->getDisplayName().lower()!="inbox")
685	{	686	{
686	m->insertItem(QObject::tr("Delete folder",contextName),3);	687	m->insertItem(i18n("Delete folder"),3);
687	}	688	}
688	}	689	}
@@ -708,8 +709,8 @@ void IMAPfolderItem::createNewFolder()
708	void IMAPfolderItem::deleteFolder()	709	void IMAPfolderItem::deleteFolder()
709	{	710	{
710	int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),	711	int yesno = QMessageBox::warning(0,i18n("Delete folder"),
711	QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),	712	i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
712	QObject::tr("Yes",contextName),	713	i18n("Yes"),
713	QObject::tr("No",contextName),QString::null,1,1);	714	i18n("No"),QString::null,1,1);
714		715
715	if (yesno == 0)	716	if (yesno == 0)
@@ -858,8 +859,8 @@ QPopupMenu * MHviewItem::getContextMenu()
858	if (m)	859	if (m)
859	{	860	{
860	m->insertItem(QObject::tr("Refresh folder list",contextName),0);	861	m->insertItem(i18n("Refresh folder list"),0);
861	m->insertItem(QObject::tr("Create new folder",contextName),1);	862	m->insertItem(i18n("Create new folder"),1);
862	m->insertItem(QObject::tr("Delete all mails",contextName),2);	863	m->insertItem(i18n("Delete all mails"),2);
863	m->insertItem(QObject::tr("Move/Copie all mails",contextName),3);	864	m->insertItem(i18n("Move/Copie all mails"),3);
864	}	865	}
865	return m;	866	return m;
@@ -976,8 +977,8 @@ RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
976	void MHfolderItem::deleteFolder()	977	void MHfolderItem::deleteFolder()
977	{	978	{
978	int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),	979	int yesno = QMessageBox::warning(0,i18n("Delete folder"),
979	QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),	980	i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
980	QObject::tr("Yes",contextName),	981	i18n("Yes"),
981	QObject::tr("No",contextName),QString::null,1,1);	982	i18n("No"),QString::null,1,1);
982		983
983	if (yesno == 0)	984	if (yesno == 0)
@@ -1003,8 +1004,8 @@ QPopupMenu * MHfolderItem::getContextMenu()
1003	if (m)	1004	if (m)
1004	{	1005	{
1005	m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);	1006	m->insertItem(i18n("Move/Copie all mails"),2);
1006	m->insertItem(QObject::tr("Delete all mails",contextName),0);	1007	m->insertItem(i18n("Delete all mails"),0);
1007	m->insertItem(QObject::tr("Create new subfolder",contextName),3);	1008	m->insertItem(i18n("Create new subfolder"),3);
1008	m->insertItem(QObject::tr("Delete folder",contextName),1);	1009	m->insertItem(i18n("Delete folder"),1);
1009	}	1010	}
1010	return m;	1011	return m;
@@ -1118,9 +1119,9 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
1118	QString fname="";	1119	QString fname="";
1119	if (folder) fname = folder->getDisplayName();	1120	if (folder) fname = folder->getDisplayName();
1120	int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),	1121	int yesno = QMessageBox::warning(0,i18n("Delete all mails"),
1121	QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).	1122	i18n("<center>Realy delete all mails in box <br>%1</center>").
1122	arg(fname),	1123	arg(fname),
1123	QObject::tr("Yes",contextName),	1124	i18n("Yes"),
1124	QObject::tr("No",contextName),QString::null,1,1);	1125	i18n("No"),QString::null,1,1);
1125		1126
1126	if (yesno == 0)	1127	if (yesno == 0)