summaryrefslogtreecommitdiffabout
path: root/kmicromail
Side-by-side diff
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/accountitem.cpp97
-rw-r--r--kmicromail/accountview.cpp9
-rw-r--r--kmicromail/addresspicker.cpp6
-rw-r--r--kmicromail/composemail.cpp66
-rw-r--r--kmicromail/editaccounts.cpp45
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp22
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.cpp58
-rw-r--r--kmicromail/libmailwrapper/mboxwrapper.cpp29
-rw-r--r--kmicromail/libmailwrapper/pop3wrapper.cpp21
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp59
-rw-r--r--kmicromail/nntpgroupsdlg.cpp3
-rw-r--r--kmicromail/selectsmtp.cpp5
-rw-r--r--kmicromail/viewmail.cpp23
-rw-r--r--kmicromail/viewmailbase.cpp21
14 files changed, 237 insertions, 227 deletions
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 49d86fc..567de87 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -17,2 +17,3 @@
#include <kiconloader.h>
+#include <klocale.h>
@@ -94,5 +95,5 @@ QPopupMenu * POP3viewItem::getContextMenu()
{
- 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);
}
@@ -100,4 +101,4 @@ QPopupMenu * POP3viewItem::getContextMenu()
{
- 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);
}
@@ -189,6 +190,6 @@ QPopupMenu * POP3folderItem::getContextMenu()
{
- 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);
}
@@ -302,5 +303,5 @@ QPopupMenu * NNTPviewItem::getContextMenu()
{
- 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);
}
@@ -308,3 +309,3 @@ QPopupMenu * NNTPviewItem::getContextMenu()
{
- m->insertItem(QObject::tr("Set online",contextName),1);
+ m->insertItem(i18n("Set online"),1);
}
@@ -398,4 +399,4 @@ QPopupMenu * NNTPfolderItem::getContextMenu()
{
- 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);
}
@@ -519,8 +520,8 @@ QPopupMenu * IMAPviewItem::getContextMenu()
{
- 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();
@@ -529,4 +530,4 @@ QPopupMenu * IMAPviewItem::getContextMenu()
{
- 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);
}
@@ -674,6 +675,6 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
{
- 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);
}
@@ -681,3 +682,3 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
{
- m->insertItem(QObject::tr("Create new subfolder",contextName),2);
+ m->insertItem(i18n("Create new subfolder"),2);
}
@@ -685,3 +686,3 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
{
- m->insertItem(QObject::tr("Delete folder",contextName),3);
+ m->insertItem(i18n("Delete folder"),3);
}
@@ -709,6 +710,6 @@ 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);
@@ -859,6 +860,6 @@ QPopupMenu * MHviewItem::getContextMenu()
{
- 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);
}
@@ -977,6 +978,6 @@ 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);
@@ -1004,6 +1005,6 @@ QPopupMenu * MHfolderItem::getContextMenu()
{
- 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);
}
@@ -1119,7 +1120,7 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
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);
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index de8c5bb..c10d384 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -18,2 +18,3 @@
#include <qspinbox.h>
+#include <klocale.h>
@@ -158,4 +159,4 @@ void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromW
{
- 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;
@@ -188,4 +189,4 @@ void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrappe
{
- 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;
diff --git a/kmicromail/addresspicker.cpp b/kmicromail/addresspicker.cpp
index ec6da49..f4234b4 100644
--- a/kmicromail/addresspicker.cpp
+++ b/kmicromail/addresspicker.cpp
@@ -64,3 +64,3 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
addressList->insertItem(
- tr( "There are no entries in the addressbook." ) );
+ i18n( "There are no entries in the addressbook." ) );
#endif
@@ -91,4 +91,4 @@ void AddressPicker::accept()
{
- QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
- " at least one address entry.</p>"), tr("Ok"));
+ QMessageBox::information(this, i18n("Error"), i18n("<p>You have to select"
+ " at least one address entry.</p>"), i18n("Ok"));
return;
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 946e97d..35ad367 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -54,5 +54,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
if ( whoami_uid.isEmpty() ) {
- QMessageBox::information( 0, tr( "Hint" ),
- tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
- tr( "Ok" ) );
+ QMessageBox::information( 0, i18n( "Hint" ),
+ i18n( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
+ i18n( "Ok" ) );
@@ -69,5 +69,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
if ( mails.count() == 0)
- QMessageBox::information( 0, tr( "Hint" ),
- tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
- tr( "Ok" ) );
+ QMessageBox::information( 0, i18n( "Hint" ),
+ i18n( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
+ i18n( "Ok" ) );
if (defmail.length()!=0) {
@@ -89,4 +89,4 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
- attList->addColumn( tr( "Name" ) );
- attList->addColumn( tr( "Size" ) );
+ attList->addColumn( i18n( "Name" ) );
+ attList->addColumn( i18n( "Size" ) );
QList<Account> accounts = settings->getAccounts();
@@ -115,5 +115,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
} else {
- QMessageBox::information( 0, tr( "Problem" ),
- tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
- tr( "Ok" ) );
+ QMessageBox::information( 0, i18n( "Problem" ),
+ i18n( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
+ i18n( "Ok" ) );
return;
@@ -174,7 +174,7 @@ void ComposeMail::saveAsDraft()
if ( warnAttach )
- QMessageBox::warning(0,tr("Store message"),
- tr("<center>Attachments will not be stored in \"Draft\" folder</center>"));
+ QMessageBox::warning(0,i18n("Store message"),
+ i18n("<center>Attachments will not be stored in \"Draft\" folder</center>"));
warnAttach = false;
}
- setStatus( tr("Mail saved as draft!") );
+ setStatus( i18n("Mail saved as draft!") );
}
@@ -182,3 +182,3 @@ void ComposeMail::clearStatus()
{
- topLevelWidget()->setCaption( tr("Compose mail") );
+ topLevelWidget()->setCaption( i18n("Compose mail") );
}
@@ -230,5 +230,5 @@ void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
if ( emailList.count() == 0 )
- QMessageBox::information( 0, tr( "Hint" ),
- tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
- tr( "Ok" ) );
+ QMessageBox::information( 0, i18n( "Hint" ),
+ i18n( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
+ i18n( "Ok" ) );
if (defmail.length()!=0) {
@@ -357,5 +357,5 @@ void ComposeMail::removeAttachment()
if ( !attList->currentItem() ) {
- QMessageBox::information( this, tr( "Error" ),
- tr( "<p>Please select a File.</p>" ),
- tr( "Ok" ) );
+ QMessageBox::information( this, i18n( "Error" ),
+ i18n( "<p>Please select a File.</p>" ),
+ i18n( "Ok" ) );
} else {
@@ -374,6 +374,6 @@ void ComposeMail::accept()
if (! checkBoxLater->isChecked() ) {
- int yesno = QMessageBox::warning(0,tr("Stop editing message"),
- tr("Send this message?"),
- tr("Yes"),
- tr("Cancel"));
+ int yesno = QMessageBox::warning(0,i18n("Stop editing message"),
+ i18n("Send this message?"),
+ i18n("Yes"),
+ i18n("Cancel"));
@@ -395,4 +395,4 @@ void ComposeMail::accept()
} else {
- QMessageBox::warning(0,tr("Sending mail"),
- tr("No Receiver spezified" ) );
+ QMessageBox::warning(0,i18n("Sending mail"),
+ i18n("No Receiver spezified" ) );
return;
@@ -437,6 +437,6 @@ void ComposeMail::reject()
//qDebug("ComposeMail::reject() ");
- int yesno = QMessageBox::warning(0,tr("Store message?"),
- tr("Store message into drafts?\n"),
- tr("Yes"),
- tr("No"));
+ int yesno = QMessageBox::warning(0,i18n("Store message?"),
+ i18n("Store message into drafts?\n"),
+ i18n("Yes"),
+ i18n("No"));
@@ -445,4 +445,4 @@ void ComposeMail::reject()
if ( toLine->text().isEmpty() ) {
- QMessageBox::warning(0,tr("Sending mail"),
- tr("No Receiver spezified" ) );
+ QMessageBox::warning(0,i18n("Sending mail"),
+ i18n("No Receiver spezified" ) );
return;
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index 733e38a..7ad4ec8 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -19,2 +19,3 @@
#include <qspinbox.h>
+#include <klocale.h>
@@ -55,6 +56,6 @@ EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool
- mailList->addColumn( tr( "Account" ) );
- mailList->addColumn( tr( "Type" ) );
+ mailList->addColumn( i18n( "Account" ) );
+ mailList->addColumn( i18n( "Type" ) );
- newsList->addColumn( tr( "Account" ) );
+ newsList->addColumn( i18n( "Account" ) );
@@ -209,5 +210,5 @@ void EditAccounts::slotDeleteAccount( Account *account )
{
- if ( QMessageBox::information( this, tr( "Question" ),
- tr( "<p>Do you really want to delete the selected Account?</p>" ),
- tr( "Yes" ), tr( "No" ) ) == 0 )
+ if ( QMessageBox::information( this, i18n( "Question" ),
+ i18n( "<p>Do you really want to delete the selected Account?</p>" ),
+ i18n( "Yes" ), i18n( "No" ) ) == 0 )
{
@@ -222,5 +223,5 @@ void EditAccounts::slotEditMail()
{
- QMessageBox::information( this, tr( "Error" ),
- tr( "<p>Please select an account.</p>" ),
- tr( "Ok" ) );
+ QMessageBox::information( this, i18n( "Error" ),
+ i18n( "<p>Please select an account.</p>" ),
+ i18n( "Ok" ) );
return;
@@ -236,5 +237,5 @@ void EditAccounts::slotDeleteMail()
{
- QMessageBox::information( this, tr( "Error" ),
- tr( "<p>Please select an account.</p>" ),
- tr( "Ok" ) );
+ QMessageBox::information( this, i18n( "Error" ),
+ i18n( "<p>Please select an account.</p>" ),
+ i18n( "Ok" ) );
return;
@@ -255,5 +256,5 @@ void EditAccounts::slotEditNews()
{
- QMessageBox::information( this, tr( "Error" ),
- tr( "<p>Please select an account.</p>" ),
- tr( "Ok" ) );
+ QMessageBox::information( this, i18n( "Error" ),
+ i18n( "<p>Please select an account.</p>" ),
+ i18n( "Ok" ) );
return;
@@ -269,5 +270,5 @@ void EditAccounts::slotDeleteNews()
{
- QMessageBox::information( this, tr( "Error" ),
- tr( "<p>Please select an account.</p>" ),
- tr( "Ok" ) );
+ QMessageBox::information( this, i18n( "Error" ),
+ i18n( "<p>Please select an account.</p>" ),
+ i18n( "Ok" ) );
return;
@@ -557,3 +558,3 @@ void NNTPconfig::slotShowSub()
}
- topLevelWidget()->setCaption( tr("%1 groups subscribed").arg( subscribedGroups.count()));
+ topLevelWidget()->setCaption( i18n("%1 groups subscribed").arg( subscribedGroups.count()));
}
@@ -575,3 +576,3 @@ void NNTPconfig::slotShowFilter()
}
- topLevelWidget()->setCaption( tr("Filter found %1 groups").arg( count));
+ topLevelWidget()->setCaption( i18n("Filter found %1 groups").arg( count));
}
@@ -580,3 +581,3 @@ void NNTPconfig::slotGetNG() {
data->save();
- topLevelWidget()->setCaption( tr("Fetching group list..."));
+ topLevelWidget()->setCaption( i18n("Fetching group list..."));
qApp->processEvents();
@@ -584,3 +585,3 @@ void NNTPconfig::slotGetNG() {
allGroups = tmp->listAllNewsgroups();
- topLevelWidget()->setCaption( tr("Downloaded %1 group names").arg( allGroups.count()));
+ topLevelWidget()->setCaption( i18n("Downloaded %1 group names").arg( allGroups.count()));
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 2d7533c..8ee112c 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -13,3 +13,3 @@
#include <qmessagebox.h>
-
+#include <klocale.h>
#include <kdecore/kstandarddirs.h>
@@ -149,6 +149,6 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
QProgressBar wid ( count );
- wid.setCaption( tr("Deleting ..."));
+ wid.setCaption( i18n("Deleting ..."));
wid.show();
while (iii < count ) {
- Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+ Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
wid.setProgress( iii );
@@ -174,4 +174,4 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
{
- QMessageBox::critical(0,tr("Error creating new Folder"),
- tr("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
+ QMessageBox::critical(0,i18n("Error creating new Folder"),
+ i18n("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
return;
@@ -182,3 +182,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
qDebug("There are no new messages %s", fromFolder->getName().latin1());
- Global::statusMessage(tr("There are no new messages"));
+ Global::statusMessage(i18n("There are no new messages"));
return;
@@ -212,3 +212,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
if ( n.count() == 0 ) {
- Global::statusMessage(tr("There are no new messages"));
+ Global::statusMessage(i18n("There are no new messages"));
return;
@@ -216,3 +216,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer());
- Global::statusMessage(tr("Downloaded %1 messages").arg(n.count()));
+ Global::statusMessage(i18n("Downloaded %1 messages").arg(n.count()));
@@ -242,9 +242,9 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
// wel, processevents is qite strange, we need a widget for getting
- // Global::statusMessage(tr("Copy2 message %1").arg(iii)); displaye
+ // Global::statusMessage(i18n("Copy2 message %1").arg(iii)); displaye
QProgressBar wid ( count );
- wid.setCaption( tr("Copying ..."));
+ wid.setCaption( i18n("Copying..."));
wid.show();
while (iii < count ) {
- Global::statusMessage(tr("Copy message %1 of %2").arg(iii).arg(count));
+ Global::statusMessage(i18n("Copy message %1 of %2").arg(iii).arg(count));
wid.setProgress( iii );
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 8150453..3aec13d 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -50,3 +50,3 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
//qDebug("imap progress %d of %d ",current,maximum );
- //Global::statusMessage(tr("Downloading message %1 of %2").arg( current).arg(maximum));
+ //Global::statusMessage(i18n("Downloading message %1 of %2").arg( current).arg(maximum));
//qApp->processEvents()
@@ -68,4 +68,4 @@ void IMAPwrapper::progress( QString m )
//qDebug("progress ");
- if ( mMax ) mess = mProgrMess +tr(" message %1 of %2").arg( mCurrent++).arg(mMax);
- else mess = mProgrMess +tr(" message %1").arg( mCurrent++);
+ if ( mMax ) mess = mProgrMess +i18n(" message %1 of %2").arg( mCurrent++).arg(mMax);
+ else mess = mProgrMess +i18n(" message %1").arg( mCurrent++);
Global::statusMessage(mess);
@@ -102,3 +102,3 @@ bool IMAPwrapper::start_tls(bool force_tls)
if (err != MAILIMAP_NO_ERROR && force_tls) {
- Global::statusMessage(tr("Server has no TLS support!"));
+ Global::statusMessage(i18n("Server has no TLS support!"));
try_tls = false;
@@ -190,3 +190,3 @@ void IMAPwrapper::login()
}
- Global::statusMessage(tr("error connecting imap server: %1").arg(failure));
+ Global::statusMessage(i18n("error connecting imap server: %1").arg(failure));
mailimap_free( m_imap );
@@ -202,3 +202,3 @@ void IMAPwrapper::login()
if (force_tls && !try_tls) {
- Global::statusMessage(tr("Server has no TLS support!"));
+ Global::statusMessage(i18n("Server has no TLS support!"));
ok = false;
@@ -212,3 +212,3 @@ void IMAPwrapper::login()
if ( err != MAILIMAP_NO_ERROR ) {
- Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("error logging in imap server: %1").arg(m_imap->imap_response));
ok = false;
@@ -258,3 +258,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
if (last == 0) {
- Global::statusMessage(tr("Mailbox has no mails"));
+ Global::statusMessage(i18n("Mailbox has no mails"));
return;
@@ -262,6 +262,6 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
}
- progress( tr("Fetch "));
+ progress( i18n("Fetch "));
mMax = last;
//qDebug("last %d ", last);
- Global::statusMessage(tr("Fetching header list"));
+ Global::statusMessage(i18n("Fetching header list"));
qApp->processEvents();
@@ -301,3 +301,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
}
- Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count()));
+ Global::statusMessage(i18n("Mailbox has %1 mails").arg(target.count()));
} else {
@@ -306,3 +306,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
if ( tryAgain < 0 )
- Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("Error fetching headers: %1").arg(m_imap->imap_response));
else
@@ -335,3 +335,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
*/
- Global::statusMessage(tr("Fetching folder list"));
+ Global::statusMessage(i18n("Fetching folder list"));
qApp->processEvents();
@@ -971,9 +971,9 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
mMax = count;
- progress( tr("Delete"));
+ progress( i18n("Delete"));
QProgressBar wid ( count );
- wid.setCaption( tr("Deleting ..."));
+ wid.setCaption( i18n("Deleting ..."));
wid.show();
while (iii < count ) {
- Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+ Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
wid.setProgress( iii );
@@ -1005,3 +1005,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
//if (err != MAILIMAP_NO_ERROR) {
- // Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
+ // Global::statusMessage(i18n("Error deleting mails: %s").arg(m_imap->imap_response));
// }
@@ -1014,3 +1014,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
if (err != MAILIMAP_NO_ERROR) {
- Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("Error deleting mails: %s").arg(m_imap->imap_response));
}
@@ -1048,3 +1048,3 @@ void IMAPwrapper::deleteMail(const RecMailP&mail)
if (err != MAILIMAP_NO_ERROR) {
- Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response));
}
@@ -1131,3 +1131,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
if (last == 0) {
- Global::statusMessage(tr("Mailbox has no mails!"));
+ Global::statusMessage(i18n("Mailbox has no mails!"));
return 0;
@@ -1142,3 +1142,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
if (err != MAILIMAP_NO_ERROR) {
- Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response));
return 0;
@@ -1149,3 +1149,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
if (err != MAILIMAP_NO_ERROR) {
- Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response));
return 0;
@@ -1173,3 +1173,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
} else {
- Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre));
+ Global::statusMessage(i18n("Cannot create folder %1 for holding subfolders").arg(pre));
return 0;
@@ -1180,3 +1180,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
if (res != MAILIMAP_NO_ERROR) {
- Global::statusMessage(tr("%1").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("%1").arg(m_imap->imap_response));
return 0;
@@ -1193,3 +1193,3 @@ int IMAPwrapper::deleteMbox(const FolderP&folder)
if (res != MAILIMAP_NO_ERROR) {
- Global::statusMessage(tr("%1").arg(m_imap->imap_response));
+ Global::statusMessage(i18n("%1").arg(m_imap->imap_response));
return 0;
@@ -1276,3 +1276,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
mMax = 0;
- progress( tr("Copy"));
+ progress( i18n("Copy"));
AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb);
@@ -1291,3 +1291,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
}
- Global::statusMessage( tr("Copying mails on server...") );
+ Global::statusMessage( i18n("Copying mails on server...") );
int last = m_imap->imap_selection_info->sel_exists;
@@ -1297,3 +1297,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
if ( err != MAILIMAP_NO_ERROR ) {
- QString error_msg = tr("Error copy mails: %1").arg(m_imap->imap_response);
+ QString error_msg = i18n("Error copy mails: %1").arg(m_imap->imap_response);
Global::statusMessage(error_msg);
@@ -1327,3 +1327,3 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra
if ( err != MAILIMAP_NO_ERROR ) {
- QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response);
+ QString error_msg = i18n("error copy mail: %1").arg(m_imap->imap_response);
Global::statusMessage(error_msg);
diff --git a/kmicromail/libmailwrapper/mboxwrapper.cpp b/kmicromail/libmailwrapper/mboxwrapper.cpp
index 39dd156..0cdbae4 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.cpp
+++ b/kmicromail/libmailwrapper/mboxwrapper.cpp
@@ -6,2 +6,3 @@
#include <stdlib.h>
+#include <klocale.h>
@@ -46,3 +47,3 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
mailstorage_free(storage);
- Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count()));
+ Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count()));
}
@@ -145,3 +146,3 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b
if (fi.exists()) {
- Global::statusMessage(tr("Mailbox exists."));
+ Global::statusMessage(i18n("Mailbox exists."));
return 0;
@@ -150,3 +151,3 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b
if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error init folder"));
+ Global::statusMessage(i18n("Error init folder"));
return 0;
@@ -164,3 +165,3 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde
if (r != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error init folder"));
+ Global::statusMessage(i18n("Error init folder"));
return;
@@ -169,3 +170,3 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde
if (r != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error writing to message folder"));
+ Global::statusMessage(i18n("Error writing to message folder"));
}
@@ -189,3 +190,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
if (r != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error initializing mbox"));
+ Global::statusMessage(i18n("Error initializing mbox"));
mailfolder_free(folder);
@@ -196,3 +197,3 @@ encodedString* MBOXwrapper::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()));
mailfolder_free(folder);
@@ -203,3 +204,3 @@ encodedString* MBOXwrapper::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()));
mailfolder_free(folder);
@@ -259,3 +260,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
if (r != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error initializing mbox"));
+ Global::statusMessage(i18n("Error initializing mbox"));
res = 0;
@@ -266,3 +267,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
if (r != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error initializing mbox"));
+ Global::statusMessage(i18n("Error initializing mbox"));
res = 0;
@@ -280,3 +281,3 @@ int MBOXwrapper::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;
@@ -297,3 +298,3 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder)
if (!fi.exists()) {
- Global::statusMessage(tr("Mailbox doesn't exist."));
+ Global::statusMessage(i18n("Mailbox doesn't exist."));
return 0;
@@ -301,3 +302,3 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder)
if (!fi.remove()) {
- Global::statusMessage(tr("Error deleting Mailbox."));
+ Global::statusMessage(i18n("Error deleting Mailbox."));
return 0;
@@ -317,3 +318,3 @@ void MBOXwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
if (!fi.exists()) {
- Global::statusMessage(tr("Mailbox doesn't exist."));
+ Global::statusMessage(i18n("Mailbox doesn't exist."));
return;
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 9d52f52..2888f7c 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -7,2 +7,3 @@
+#include <klocale.h>
@@ -109,3 +110,3 @@ void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPoi
parseList(target,m_pop3->sto_session,"INBOX", false, maxSizeInKb);
- Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
+ Global::statusMessage( i18n("Mailbox contains %1 mail(s)").arg(res_messages));
}
@@ -167,3 +168,3 @@ void POP3wrapper::login()
; // odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl;
- Global::statusMessage(tr("Error %1 initializing folder").arg( err ));
+ Global::statusMessage(i18n("Error %1 initializing folder").arg( err ));
mailstorage_free(m_pop3);
@@ -204,6 +205,6 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
QProgressBar wid ( count );
- wid.setCaption( tr("Deleting ..."));
+ wid.setCaption( i18n("Deleting ..."));
wid.show();
while (iii < count ) {
- Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
+ Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
wid.setProgress( iii );
@@ -215,3 +216,3 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
if (err != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error deleting mail"));
+ Global::statusMessage(i18n("Error deleting mail"));
}
@@ -226,3 +227,3 @@ void POP3wrapper::deleteMail(const RecMailP&mail) {
if (err != MAIL_NO_ERROR) {
- Global::statusMessage(tr("error deleting mail"));
+ Global::statusMessage(i18n("error deleting mail"));
}
@@ -241,3 +242,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
if (err != MAIL_NO_ERROR) {
- Global::statusMessage(tr("Error getting folder info"));
+ Global::statusMessage(i18n("Error getting folder info"));
return 0;
@@ -248,6 +249,6 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
QProgressBar wid ( result );
- wid.setCaption( tr("Deleting ..."));
+ wid.setCaption( i18n("Deleting ..."));
wid.show();
for (unsigned int i = 0; i < result; ++i) {
- Global::statusMessage(tr("Delete message %1 of %2").arg(i).arg(result));
+ Global::statusMessage(i18n("Delete message %1 of %2").arg(i).arg(result));
wid.setProgress( i );
@@ -258,3 +259,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
if (err != 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;
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index d5a528c..dee1477 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -16,2 +16,3 @@
#include <libetpan/libetpan.h>
+#include <klocale.h>
@@ -46,39 +47,39 @@ QString SMTPwrapper::mailsmtpError( int errnum ) {
case MAILSMTP_NO_ERROR:
- return tr( "No error" );
+ return i18n( "No error" );
case MAILSMTP_ERROR_UNEXPECTED_CODE:
- return tr( "Unexpected error code" );
+ return i18n( "Unexpected error code" );
case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
- return tr( "Service not available" );
+ return i18n( "Service not available" );
case MAILSMTP_ERROR_STREAM:
- return tr( "Stream error" );
+ return i18n( "Stream error" );
case MAILSMTP_ERROR_HOSTNAME:
- return tr( "gethostname() failed" );
+ return i18n( "gethostname() failed" );
case MAILSMTP_ERROR_NOT_IMPLEMENTED:
- return tr( "Not implemented" );
+ return i18n( "Not implemented" );
case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
- return tr( "Error, action not taken" );
+ return i18n( "Error, action not taken" );
case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
- return tr( "Data exceeds storage allocation" );
+ return i18n( "Data exceeds storage allocation" );
case MAILSMTP_ERROR_IN_PROCESSING:
- return tr( "Error in processing" );
+ return i18n( "Error in processing" );
case MAILSMTP_ERROR_STARTTLS_NOT_SUPPORTED:
- return tr( "Starttls not supported" );
+ return i18n( "Starttls not supported" );
// case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
- // return tr( "Insufficient system storage" );
+ // return i18n( "Insufficient system storage" );
case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
- return tr( "Mailbox unavailable" );
+ return i18n( "Mailbox unavailable" );
case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
- return tr( "Mailbox name not allowed" );
+ return i18n( "Mailbox name not allowed" );
case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
- return tr( "Bad command sequence" );
+ return i18n( "Bad command sequence" );
case MAILSMTP_ERROR_USER_NOT_LOCAL:
- return tr( "User not local" );
+ return i18n( "User not local" );
case MAILSMTP_ERROR_TRANSACTION_FAILED:
- return tr( "Transaction failed" );
+ return i18n( "Transaction failed" );
case MAILSMTP_ERROR_MEMORY:
- return tr( "Memory error" );
+ return i18n( "Memory error" );
case MAILSMTP_ERROR_CONNECTION_REFUSED:
- return tr( "Connection refused" );
+ return i18n( "Connection refused" );
default:
- return tr( "Unknown error code" );
+ return i18n( "Unknown error code" );
}
@@ -154,4 +155,4 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*
if (failuremessage) {
- QMessageBox::critical(0,tr("Error sending mail"),
- tr("<center>%1</center>").arg(failuremessage));
+ QMessageBox::critical(0,i18n("Error sending mail"),
+ i18n("<center>%1</center>").arg(failuremessage));
}
@@ -223,3 +224,3 @@ void SMTPwrapper::connect_server()
; // odebug << "Error init connection" << oendl;
- failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
+ failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err));
result = 0;
@@ -232,3 +233,3 @@ void SMTPwrapper::connect_server()
result = 0;
- failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
+ failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err));
}
@@ -247,3 +248,3 @@ void SMTPwrapper::connect_server()
result = 0;
- failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err));
+ failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err));
}
@@ -263,3 +264,3 @@ void SMTPwrapper::connect_server()
result = 0;
- failuretext=tr("Login aborted - storing mail to localfolder");
+ failuretext=i18n("Login aborted - storing mail to localfolder");
}
@@ -275,3 +276,3 @@ void SMTPwrapper::connect_server()
} else {
- failuretext = tr("Authentification failed");
+ failuretext = i18n("Authentification failed");
result = 0;
@@ -302,3 +303,3 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
if ( err != MAILSMTP_NO_ERROR ) {
- failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err));
+ failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err));
result = 0;
@@ -435,4 +436,4 @@ bool SMTPwrapper::flushOutbox() {
if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) {
- QMessageBox::critical(0,tr("Error sending mail"),
- tr("Error sending queued mail - breaking"));
+ QMessageBox::critical(0,i18n("Error sending mail"),
+ i18n("Error sending queued mail - breaking"));
returnValue = false;
diff --git a/kmicromail/nntpgroupsdlg.cpp b/kmicromail/nntpgroupsdlg.cpp
index c94d9fa..a461bdf 100644
--- a/kmicromail/nntpgroupsdlg.cpp
+++ b/kmicromail/nntpgroupsdlg.cpp
@@ -2,2 +2,3 @@
#include "nntpgroups.h"
+#include <klocale.h>
@@ -10,3 +11,3 @@ NNTPGroupsDlg::NNTPGroupsDlg(NNTPaccount *account,QWidget * parent, const char *
{
- setCaption(tr("Subscribed newsgroups"));
+ setCaption(i18n("Subscribed newsgroups"));
m_Account = account;
diff --git a/kmicromail/selectsmtp.cpp b/kmicromail/selectsmtp.cpp
index 24eced1..ff8b524 100644
--- a/kmicromail/selectsmtp.cpp
+++ b/kmicromail/selectsmtp.cpp
@@ -11,2 +11,3 @@
#include <qlistview.h>
+#include <klocale.h>
selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
@@ -16,3 +17,3 @@ selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
m_smtpList = 0;
- //headlabel->setText(tr("<center>Select SMTP account to use</center>"));
+ //headlabel->setText(i18n("<center>Select SMTP account to use</center>"));
headlabel->hide();
@@ -28,3 +29,3 @@ selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
m_current_smtp = 0;
- setCaption(tr("Select SMTP Account"));
+ setCaption(i18n("Select SMTP Account"));
}
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 32a3b7c..7cf5c8e 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -28,2 +28,3 @@
#include "koprefs.h"
+#include <klocale.h>
@@ -220,8 +221,8 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
{
- menu->insertItem( tr( "Show Text" ), 1 );
+ menu->insertItem( i18n( "Show Text" ), 1 );
}
if (item->text(0).left(6)=="image/") {
- menu->insertItem(tr("Display image preview"),2);
+ menu->insertItem(i18n("Display image preview"),2);
}
- menu->insertItem( tr( "Save Attachment" ), 0 );
+ menu->insertItem( i18n( "Save Attachment" ), 0 );
menu->insertSeparator(1);
@@ -358,3 +359,3 @@ void ViewMail::setText()
- setCaption( tr("E-Mail by %1").arg( m_mail[0] ) );
+ setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
@@ -364,6 +365,6 @@ void ViewMail::setText()
"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
- "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
- "<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
- tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
- "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +
+ "<b>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
+ "<b>" + i18n( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
+ i18n( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
+ "<b>" + i18n( "Date" ) + ": </b> " + m_mail[3] +
"</td></tr></table><font>";
@@ -428,3 +429,3 @@ void ViewMail::slotReply()
{
- QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
+ QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot reply yet."), i18n("Ok"));
return;
@@ -471,3 +472,3 @@ void ViewMail::slotForward()
{
- QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
+ QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot forward yet."), i18n("Ok"));
return;
@@ -504,3 +505,3 @@ void ViewMail::slotDeleteMail( )
{
- if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , 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>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
{
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 705b57f..3d7ed42 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -11,2 +11,3 @@
//#include <qpe/resource.h>
+#include <klocale.h>
@@ -24,3 +25,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
mailmenu = new QPopupMenu( menubar );
- menubar->insertItem( tr( "Mail" ), mailmenu );
+ menubar->insertItem( i18n( "Mail" ), mailmenu );
@@ -29,3 +30,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
- reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
+ reply = new QAction(i18n("Reply"),SmallIcon("reply"), 0, 0, this);
reply->addTo(toolbar);
@@ -33,3 +34,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
- forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this);
+ forward = new QAction(i18n("Forward"),SmallIcon("forward"), 0, 0, this);
forward->addTo(toolbar);
@@ -37,3 +38,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
- attachbutton = new QAction(tr("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true);
+ attachbutton = new QAction(i18n("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true);
attachbutton->addTo(toolbar);
@@ -43,3 +44,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
- showHtml = new QAction( tr( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true );
+ showHtml = new QAction( i18n( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true );
showHtml->addTo( toolbar );
@@ -47,6 +48,6 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
- deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
+ deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this);
deleteMail->addTo(toolbar);
deleteMail->addTo(mailmenu);
- closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
+ closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
QLabel *spacer = new QLabel(toolbar);
@@ -64,5 +65,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
attachments->addColumn("Mime Type", 60);
- attachments->addColumn(tr("Description"), 100);
- attachments->addColumn(tr("Filename"), 80);
- attachments->addColumn(tr("Size"), 80);
+ attachments->addColumn(i18n("Description"), 100);
+ attachments->addColumn(i18n("Filename"), 80);
+ attachments->addColumn(i18n("Size"), 80);
attachments->setSorting(-1);