summaryrefslogtreecommitdiffabout
path: root/kmicromail
Side-by-side diff
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/main.cpp3
-rw-r--r--kmicromail/mainwindow.cpp48
-rw-r--r--kmicromail/opiemail.cpp41
3 files changed, 47 insertions, 45 deletions
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index 5362f08..8947ff8 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -20,5 +20,5 @@
#include "mainwindow.h"
#include "koprefs.h"
-
+void dumpMissing();
//using namespace Opie::Core;
int main( int argc, char **argv ) {
@@ -58,4 +58,5 @@ int main( int argc, char **argv ) {
#endif
int rv = a.exec();
+ dumpMissing();
return rv;
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index ddded2a..c77345b 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -23,5 +23,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
: QMainWindow( parent, name ) //, flags )
{
- setCaption( tr( "KOpieMail/Pi" ) );
+ setCaption( i18n( "KOpieMail/Pi" ) );
setToolBarsMovable( false );
//KABC::StdAddressBook::self();
@@ -29,11 +29,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
menuBar = new QPEMenuBar( toolBar );
mailMenu = new QPopupMenu( menuBar );
- menuBar->insertItem( tr( "Mail" ), mailMenu );
+ menuBar->insertItem( i18n( "Mail" ), mailMenu );
settingsMenu = new QPopupMenu( menuBar );
- menuBar->insertItem( tr( "Settings" ), settingsMenu );
+ menuBar->insertItem( i18n( "Settings" ), settingsMenu );
addToolBar( toolBar );
toolBar->setHorizontalStretchable( true );
- QAction* getMail = new QAction( tr( "Get all new mails" ), SmallIcon("enter"),
+ QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
0, 0, this );
connect(getMail, SIGNAL( activated() ),
@@ -41,5 +41,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
getMail->addTo( mailMenu );
- getMail = new QAction( tr( "Get new messages" ), SmallIcon("add"),
+ getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"),
0, 0, this );
getMail->addTo( toolBar );
@@ -48,10 +48,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
SLOT( slotGetMail() ) );
- composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
+ composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"),
0, 0, this );
composeMail->addTo( toolBar );
composeMail->addTo( mailMenu );
- sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") ,
+ sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") ,
0, 0, this );
sendQueued->addTo( toolBar );
@@ -59,5 +59,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
/*
- syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC,
+ syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC,
0, 0, this );
syncFolders->addTo( toolBar );
@@ -65,5 +65,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
*/
- showFolders = new QAction( tr( "Show/Hide folders" ), SmallIcon("showfolders") ,
+ showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") ,
0, 0, this, 0, true );
showFolders->addTo( toolBar );
@@ -74,5 +74,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
/*
- searchMails = new QAction( tr( "Search mails" ), SmallIcon("find") ),
+ searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
0, 0, this );
searchMails->addTo( toolBar );
@@ -80,5 +80,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
*/
- deleteMails = new QAction(tr("Delete Mail"), SmallIcon("trash"), 0, 0, this);
+ deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this);
deleteMails->addTo( toolBar );
deleteMails->addTo( mailMenu );
@@ -86,10 +86,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
SLOT( slotDeleteMail() ) );
- editSettings = new QAction( tr( "Edit settings" ), SmallIcon("SettingsIcon") ,
+ editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") ,
0, 0, this );
editSettings->addTo( settingsMenu );
connect( editSettings, SIGNAL( activated() ),
SLOT( slotEditSettings() ) );
- editAccounts = new QAction( tr( "Configure accounts" ), SmallIcon("editaccounts") ,
+ editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") ,
0, 0, this );
editAccounts->addTo( settingsMenu );
@@ -108,14 +108,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
folderView->header()->hide();
folderView->setRootIsDecorated( false );
- folderView->addColumn( tr( "Mailbox" ) );
+ folderView->addColumn( i18n( "Mailbox" ) );
//layout->addWidget( folderView );
mailView = new QListView( split );
- mailView->addColumn( tr( " " ) );
- mailView->addColumn( tr( "Subject" ),QListView::Manual );
- mailView->addColumn( tr( "Sender" ),QListView::Manual );
- mailView->addColumn( tr( "Size" ),QListView::Manual);
- mailView->addColumn( tr( "Date" ),QListView::Manual);
+ mailView->addColumn( i18n( " " ) );
+ mailView->addColumn( i18n( "Subject" ),QListView::Manual );
+ mailView->addColumn( i18n( "Sender" ),QListView::Manual );
+ mailView->addColumn( i18n( "Size" ),QListView::Manual);
+ mailView->addColumn( i18n( "Date" ),QListView::Manual);
mailView->setAllColumnsShowFocus(true);
//mailView->setSorting(-1);
@@ -160,5 +160,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
toolBar->setStretchableWidget( spacer );
- QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
+ QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
if ( QApplication::desktop()->width() > 320 )
@@ -168,12 +168,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
QPopupMenu* helpMenu = new QPopupMenu( menuBar );
- menuBar->insertItem( tr( "Help" ), helpMenu );
- QAction* li = new QAction(tr("About"), QPixmap(), 0, 0, this);
+ menuBar->insertItem( i18n( "Help" ), helpMenu );
+ QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this);
connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
li->addTo(helpMenu);
- li = new QAction(tr("Licence"),QPixmap(), 0, 0, this);
+ li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this);
connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
li->addTo(helpMenu);
- li = new QAction(tr("LibEtPan Licence"), QPixmap(), 0, 0, this);
+ li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this);
connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
li->addTo(helpMenu);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 164988c..3aa7905 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -12,4 +12,5 @@
#include "accountitem.h"
#include "koprefsdialog.h"
+#include "klocale.h"
#include <qmessagebox.h>
@@ -177,5 +178,5 @@ void OpieMail::slotSendQueued()
if (smtpList.count()==0)
{
- QMessageBox::information(0,tr("Info"),tr("Define a smtp account first!\n"));
+ QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n"));
return;
}
@@ -200,5 +201,5 @@ void OpieMail::slotSendQueued()
if ( wrap->flushOutbox() )
{
- QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
+ QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed"));
}
delete wrap;
@@ -274,5 +275,5 @@ void OpieMail::slotDeleteMail()
if (!mailView->currentItem()) return;
RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
- if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+ if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
{
mail->Wrapper()->deleteMail( mail );
@@ -284,5 +285,5 @@ void OpieMail::slotDeleteAllMail()
QValueList<RecMailP> t;
- if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+ if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
{
MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
@@ -321,20 +322,20 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int )
{
if (mailtype==MAILLIB::A_NNTP) {
- m->insertItem(tr("Read this posting"),this,SLOT(displayMail()));
- m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail()));
+ m->insertItem(i18n("Read this posting"),this,SLOT(displayMail()));
+ m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail()));
m->insertSeparator();
- m->insertItem(tr("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail()));
- m->insertItem(tr("Clear selection"),this,SLOT(clearSelection()));
+ m->insertItem(i18n("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail()));
+ m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
} else {
if (folderView->currentisDraft()) {
- m->insertItem(tr("Edit this mail"),this,SLOT(reEditMail()));
+ m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail()));
}
- m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
- m->insertItem(tr("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
- m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
+ m->insertItem(i18n("Read this mail"),this,SLOT(displayMail()));
+ m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
+ m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail()));
m->insertSeparator();
- m->insertItem(tr("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
- m->insertItem(tr("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
- m->insertItem(tr("Clear selection"),this,SLOT(clearSelection()));
+ m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
+ m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
+ m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
}
m->setFocus();
@@ -401,6 +402,6 @@ void OpieMail::slotMoveCopyMail()
if (sels.newFolder() && !targetMail->createMbox(targetFolder))
{
- QMessageBox::critical(0,tr("Error creating new Folder"),
- tr("<center>Error while creating<br>new folder - breaking.</center>"));
+ QMessageBox::critical(0,i18n("Error creating new Folder"),
+ i18n("<center>Error while creating<br>new folder - breaking.</center>"));
return;
}
@@ -417,5 +418,5 @@ void OpieMail::slotMoveCopyAllMail()
if (!mailView->currentItem()) return;
QValueList<RecMailP> t;
- // if ( QMessageBox::warning(this, tr("Move/Copy all selected mails"), tr("Do you really want to copy/move\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+ // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
{
MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
@@ -446,6 +447,6 @@ void OpieMail::slotMoveCopyAllMail()
if (sels.newFolder() && !targetMail->createMbox(targetFolder))
{
- QMessageBox::critical(0,tr("Error creating new Folder"),
- tr("<center>Error while creating<br>new folder - breaking.</center>"));
+ QMessageBox::critical(0,i18n("Error creating new Folder"),
+ i18n("<center>Error while creating<br>new folder - breaking.</center>"));
return;
}