-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 22 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 58 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mboxwrapper.cpp | 29 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/pop3wrapper.cpp | 21 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 59 |
5 files changed, 96 insertions, 93 deletions
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 @@ | |||
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | 14 | #include <klocale.h> | |
15 | #include <kdecore/kstandarddirs.h> | 15 | #include <kdecore/kstandarddirs.h> |
@@ -149,6 +149,6 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) | |||
149 | QProgressBar wid ( count ); | 149 | QProgressBar wid ( count ); |
150 | wid.setCaption( tr("Deleting ...")); | 150 | wid.setCaption( i18n("Deleting ...")); |
151 | wid.show(); | 151 | wid.show(); |
152 | while (iii < count ) { | 152 | while (iii < count ) { |
153 | Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); | 153 | Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count)); |
154 | wid.setProgress( iii ); | 154 | wid.setProgress( iii ); |
@@ -174,4 +174,4 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
174 | { | 174 | { |
175 | QMessageBox::critical(0,tr("Error creating new Folder"), | 175 | QMessageBox::critical(0,i18n("Error creating new Folder"), |
176 | tr("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName)); | 176 | i18n("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName)); |
177 | return; | 177 | return; |
@@ -182,3 +182,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
182 | qDebug("There are no new messages %s", fromFolder->getName().latin1()); | 182 | qDebug("There are no new messages %s", fromFolder->getName().latin1()); |
183 | Global::statusMessage(tr("There are no new messages")); | 183 | Global::statusMessage(i18n("There are no new messages")); |
184 | return; | 184 | return; |
@@ -212,3 +212,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
212 | if ( n.count() == 0 ) { | 212 | if ( n.count() == 0 ) { |
213 | Global::statusMessage(tr("There are no new messages")); | 213 | Global::statusMessage(i18n("There are no new messages")); |
214 | return; | 214 | return; |
@@ -216,3 +216,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
216 | mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer()); | 216 | mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer()); |
217 | Global::statusMessage(tr("Downloaded %1 messages").arg(n.count())); | 217 | Global::statusMessage(i18n("Downloaded %1 messages").arg(n.count())); |
218 | 218 | ||
@@ -242,9 +242,9 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, | |||
242 | // wel, processevents is qite strange, we need a widget for getting | 242 | // wel, processevents is qite strange, we need a widget for getting |
243 | // Global::statusMessage(tr("Copy2 message %1").arg(iii)); displaye | 243 | // Global::statusMessage(i18n("Copy2 message %1").arg(iii)); displaye |
244 | 244 | ||
245 | QProgressBar wid ( count ); | 245 | QProgressBar wid ( count ); |
246 | wid.setCaption( tr("Copying ...")); | 246 | wid.setCaption( i18n("Copying...")); |
247 | wid.show(); | 247 | wid.show(); |
248 | while (iii < count ) { | 248 | while (iii < count ) { |
249 | Global::statusMessage(tr("Copy message %1 of %2").arg(iii).arg(count)); | 249 | Global::statusMessage(i18n("Copy message %1 of %2").arg(iii).arg(count)); |
250 | wid.setProgress( iii ); | 250 | 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 ) | |||
50 | //qDebug("imap progress %d of %d ",current,maximum ); | 50 | //qDebug("imap progress %d of %d ",current,maximum ); |
51 | //Global::statusMessage(tr("Downloading message %1 of %2").arg( current).arg(maximum)); | 51 | //Global::statusMessage(i18n("Downloading message %1 of %2").arg( current).arg(maximum)); |
52 | //qApp->processEvents() | 52 | //qApp->processEvents() |
@@ -68,4 +68,4 @@ void IMAPwrapper::progress( QString m ) | |||
68 | //qDebug("progress "); | 68 | //qDebug("progress "); |
69 | if ( mMax ) mess = mProgrMess +tr(" message %1 of %2").arg( mCurrent++).arg(mMax); | 69 | if ( mMax ) mess = mProgrMess +i18n(" message %1 of %2").arg( mCurrent++).arg(mMax); |
70 | else mess = mProgrMess +tr(" message %1").arg( mCurrent++); | 70 | else mess = mProgrMess +i18n(" message %1").arg( mCurrent++); |
71 | Global::statusMessage(mess); | 71 | Global::statusMessage(mess); |
@@ -102,3 +102,3 @@ bool IMAPwrapper::start_tls(bool force_tls) | |||
102 | if (err != MAILIMAP_NO_ERROR && force_tls) { | 102 | if (err != MAILIMAP_NO_ERROR && force_tls) { |
103 | Global::statusMessage(tr("Server has no TLS support!")); | 103 | Global::statusMessage(i18n("Server has no TLS support!")); |
104 | try_tls = false; | 104 | try_tls = false; |
@@ -190,3 +190,3 @@ void IMAPwrapper::login() | |||
190 | } | 190 | } |
191 | Global::statusMessage(tr("error connecting imap server: %1").arg(failure)); | 191 | Global::statusMessage(i18n("error connecting imap server: %1").arg(failure)); |
192 | mailimap_free( m_imap ); | 192 | mailimap_free( m_imap ); |
@@ -202,3 +202,3 @@ void IMAPwrapper::login() | |||
202 | if (force_tls && !try_tls) { | 202 | if (force_tls && !try_tls) { |
203 | Global::statusMessage(tr("Server has no TLS support!")); | 203 | Global::statusMessage(i18n("Server has no TLS support!")); |
204 | ok = false; | 204 | ok = false; |
@@ -212,3 +212,3 @@ void IMAPwrapper::login() | |||
212 | if ( err != MAILIMAP_NO_ERROR ) { | 212 | if ( err != MAILIMAP_NO_ERROR ) { |
213 | Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response)); | 213 | Global::statusMessage(i18n("error logging in imap server: %1").arg(m_imap->imap_response)); |
214 | ok = false; | 214 | ok = false; |
@@ -258,3 +258,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma | |||
258 | if (last == 0) { | 258 | if (last == 0) { |
259 | Global::statusMessage(tr("Mailbox has no mails")); | 259 | Global::statusMessage(i18n("Mailbox has no mails")); |
260 | return; | 260 | return; |
@@ -262,6 +262,6 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma | |||
262 | } | 262 | } |
263 | progress( tr("Fetch ")); | 263 | progress( i18n("Fetch ")); |
264 | mMax = last; | 264 | mMax = last; |
265 | //qDebug("last %d ", last); | 265 | //qDebug("last %d ", last); |
266 | Global::statusMessage(tr("Fetching header list")); | 266 | Global::statusMessage(i18n("Fetching header list")); |
267 | qApp->processEvents(); | 267 | qApp->processEvents(); |
@@ -301,3 +301,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma | |||
301 | } | 301 | } |
302 | Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count())); | 302 | Global::statusMessage(i18n("Mailbox has %1 mails").arg(target.count())); |
303 | } else { | 303 | } else { |
@@ -306,3 +306,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma | |||
306 | if ( tryAgain < 0 ) | 306 | if ( tryAgain < 0 ) |
307 | Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response)); | 307 | Global::statusMessage(i18n("Error fetching headers: %1").arg(m_imap->imap_response)); |
308 | else | 308 | else |
@@ -335,3 +335,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
335 | */ | 335 | */ |
336 | Global::statusMessage(tr("Fetching folder list")); | 336 | Global::statusMessage(i18n("Fetching folder list")); |
337 | qApp->processEvents(); | 337 | qApp->processEvents(); |
@@ -971,9 +971,9 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) | |||
971 | mMax = count; | 971 | mMax = count; |
972 | progress( tr("Delete")); | 972 | progress( i18n("Delete")); |
973 | 973 | ||
974 | QProgressBar wid ( count ); | 974 | QProgressBar wid ( count ); |
975 | wid.setCaption( tr("Deleting ...")); | 975 | wid.setCaption( i18n("Deleting ...")); |
976 | wid.show(); | 976 | wid.show(); |
977 | while (iii < count ) { | 977 | while (iii < count ) { |
978 | Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); | 978 | Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count)); |
979 | wid.setProgress( iii ); | 979 | wid.setProgress( iii ); |
@@ -1005,3 +1005,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) | |||
1005 | //if (err != MAILIMAP_NO_ERROR) { | 1005 | //if (err != MAILIMAP_NO_ERROR) { |
1006 | // Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response)); | 1006 | // Global::statusMessage(i18n("Error deleting mails: %s").arg(m_imap->imap_response)); |
1007 | // } | 1007 | // } |
@@ -1014,3 +1014,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target) | |||
1014 | if (err != MAILIMAP_NO_ERROR) { | 1014 | if (err != MAILIMAP_NO_ERROR) { |
1015 | Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response)); | 1015 | Global::statusMessage(i18n("Error deleting mails: %s").arg(m_imap->imap_response)); |
1016 | } | 1016 | } |
@@ -1048,3 +1048,3 @@ void IMAPwrapper::deleteMail(const RecMailP&mail) | |||
1048 | if (err != MAILIMAP_NO_ERROR) { | 1048 | if (err != MAILIMAP_NO_ERROR) { |
1049 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 1049 | Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response)); |
1050 | } | 1050 | } |
@@ -1131,3 +1131,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) | |||
1131 | if (last == 0) { | 1131 | if (last == 0) { |
1132 | Global::statusMessage(tr("Mailbox has no mails!")); | 1132 | Global::statusMessage(i18n("Mailbox has no mails!")); |
1133 | return 0; | 1133 | return 0; |
@@ -1142,3 +1142,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) | |||
1142 | if (err != MAILIMAP_NO_ERROR) { | 1142 | if (err != MAILIMAP_NO_ERROR) { |
1143 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 1143 | Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response)); |
1144 | return 0; | 1144 | return 0; |
@@ -1149,3 +1149,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) | |||
1149 | if (err != MAILIMAP_NO_ERROR) { | 1149 | if (err != MAILIMAP_NO_ERROR) { |
1150 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 1150 | Global::statusMessage(i18n("error deleting mail: %s").arg(m_imap->imap_response)); |
1151 | return 0; | 1151 | return 0; |
@@ -1173,3 +1173,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons | |||
1173 | } else { | 1173 | } else { |
1174 | Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre)); | 1174 | Global::statusMessage(i18n("Cannot create folder %1 for holding subfolders").arg(pre)); |
1175 | return 0; | 1175 | return 0; |
@@ -1180,3 +1180,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons | |||
1180 | if (res != MAILIMAP_NO_ERROR) { | 1180 | if (res != MAILIMAP_NO_ERROR) { |
1181 | Global::statusMessage(tr("%1").arg(m_imap->imap_response)); | 1181 | Global::statusMessage(i18n("%1").arg(m_imap->imap_response)); |
1182 | return 0; | 1182 | return 0; |
@@ -1193,3 +1193,3 @@ int IMAPwrapper::deleteMbox(const FolderP&folder) | |||
1193 | if (res != MAILIMAP_NO_ERROR) { | 1193 | if (res != MAILIMAP_NO_ERROR) { |
1194 | Global::statusMessage(tr("%1").arg(m_imap->imap_response)); | 1194 | Global::statusMessage(i18n("%1").arg(m_imap->imap_response)); |
1195 | return 0; | 1195 | return 0; |
@@ -1276,3 +1276,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1276 | mMax = 0; | 1276 | mMax = 0; |
1277 | progress( tr("Copy")); | 1277 | progress( i18n("Copy")); |
1278 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb); | 1278 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb); |
@@ -1291,3 +1291,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1291 | } | 1291 | } |
1292 | Global::statusMessage( tr("Copying mails on server...") ); | 1292 | Global::statusMessage( i18n("Copying mails on server...") ); |
1293 | int last = m_imap->imap_selection_info->sel_exists; | 1293 | int last = m_imap->imap_selection_info->sel_exists; |
@@ -1297,3 +1297,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1297 | if ( err != MAILIMAP_NO_ERROR ) { | 1297 | if ( err != MAILIMAP_NO_ERROR ) { |
1298 | QString error_msg = tr("Error copy mails: %1").arg(m_imap->imap_response); | 1298 | QString error_msg = i18n("Error copy mails: %1").arg(m_imap->imap_response); |
1299 | Global::statusMessage(error_msg); | 1299 | Global::statusMessage(error_msg); |
@@ -1327,3 +1327,3 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra | |||
1327 | if ( err != MAILIMAP_NO_ERROR ) { | 1327 | if ( err != MAILIMAP_NO_ERROR ) { |
1328 | QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response); | 1328 | QString error_msg = i18n("error copy mail: %1").arg(m_imap->imap_response); |
1329 | Global::statusMessage(error_msg); | 1329 | 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 @@ | |||
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include <klocale.h> | ||
7 | 8 | ||
@@ -46,3 +47,3 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta | |||
46 | mailstorage_free(storage); | 47 | mailstorage_free(storage); |
47 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 48 | Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count())); |
48 | } | 49 | } |
@@ -145,3 +146,3 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b | |||
145 | if (fi.exists()) { | 146 | if (fi.exists()) { |
146 | Global::statusMessage(tr("Mailbox exists.")); | 147 | Global::statusMessage(i18n("Mailbox exists.")); |
147 | return 0; | 148 | return 0; |
@@ -150,3 +151,3 @@ int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,b | |||
150 | if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) { | 151 | if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) { |
151 | Global::statusMessage(tr("Error init folder")); | 152 | Global::statusMessage(i18n("Error init folder")); |
152 | return 0; | 153 | return 0; |
@@ -164,3 +165,3 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde | |||
164 | if (r != MAIL_NO_ERROR) { | 165 | if (r != MAIL_NO_ERROR) { |
165 | Global::statusMessage(tr("Error init folder")); | 166 | Global::statusMessage(i18n("Error init folder")); |
166 | return; | 167 | return; |
@@ -169,3 +170,3 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde | |||
169 | if (r != MAIL_NO_ERROR) { | 170 | if (r != MAIL_NO_ERROR) { |
170 | Global::statusMessage(tr("Error writing to message folder")); | 171 | Global::statusMessage(i18n("Error writing to message folder")); |
171 | } | 172 | } |
@@ -189,3 +190,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) | |||
189 | if (r != MAIL_NO_ERROR) { | 190 | if (r != MAIL_NO_ERROR) { |
190 | Global::statusMessage(tr("Error initializing mbox")); | 191 | Global::statusMessage(i18n("Error initializing mbox")); |
191 | mailfolder_free(folder); | 192 | mailfolder_free(folder); |
@@ -196,3 +197,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) | |||
196 | if (r != MAIL_NO_ERROR) { | 197 | if (r != MAIL_NO_ERROR) { |
197 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); | 198 | Global::statusMessage(i18n("Error fetching mail %i").arg(mail->getNumber())); |
198 | mailfolder_free(folder); | 199 | mailfolder_free(folder); |
@@ -203,3 +204,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail) | |||
203 | if (r != MAIL_NO_ERROR) { | 204 | if (r != MAIL_NO_ERROR) { |
204 | Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber())); | 205 | Global::statusMessage(i18n("Error fetching mail %i").arg(mail->getNumber())); |
205 | mailfolder_free(folder); | 206 | mailfolder_free(folder); |
@@ -259,3 +260,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | |||
259 | if (r != MAIL_NO_ERROR) { | 260 | if (r != MAIL_NO_ERROR) { |
260 | Global::statusMessage(tr("Error initializing mbox")); | 261 | Global::statusMessage(i18n("Error initializing mbox")); |
261 | res = 0; | 262 | res = 0; |
@@ -266,3 +267,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | |||
266 | if (r != MAIL_NO_ERROR) { | 267 | if (r != MAIL_NO_ERROR) { |
267 | Global::statusMessage(tr("Error initializing mbox")); | 268 | Global::statusMessage(i18n("Error initializing mbox")); |
268 | res = 0; | 269 | res = 0; |
@@ -280,3 +281,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | |||
280 | if (r != MAIL_NO_ERROR) { | 281 | if (r != MAIL_NO_ERROR) { |
281 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 282 | Global::statusMessage(i18n("Error deleting mail %1").arg(i+1)); |
282 | res = 0; | 283 | res = 0; |
@@ -297,3 +298,3 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder) | |||
297 | if (!fi.exists()) { | 298 | if (!fi.exists()) { |
298 | Global::statusMessage(tr("Mailbox doesn't exist.")); | 299 | Global::statusMessage(i18n("Mailbox doesn't exist.")); |
299 | return 0; | 300 | return 0; |
@@ -301,3 +302,3 @@ int MBOXwrapper::deleteMbox(const FolderP&tfolder) | |||
301 | if (!fi.remove()) { | 302 | if (!fi.remove()) { |
302 | Global::statusMessage(tr("Error deleting Mailbox.")); | 303 | Global::statusMessage(i18n("Error deleting Mailbox.")); |
303 | return 0; | 304 | return 0; |
@@ -317,3 +318,3 @@ void MBOXwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) | |||
317 | if (!fi.exists()) { | 318 | if (!fi.exists()) { |
318 | Global::statusMessage(tr("Mailbox doesn't exist.")); | 319 | Global::statusMessage(i18n("Mailbox doesn't exist.")); |
319 | return; | 320 | 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 @@ | |||
7 | 7 | ||
8 | #include <klocale.h> | ||
8 | 9 | ||
@@ -109,3 +110,3 @@ void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPoi | |||
109 | parseList(target,m_pop3->sto_session,"INBOX", false, maxSizeInKb); | 110 | parseList(target,m_pop3->sto_session,"INBOX", false, maxSizeInKb); |
110 | Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages)); | 111 | Global::statusMessage( i18n("Mailbox contains %1 mail(s)").arg(res_messages)); |
111 | } | 112 | } |
@@ -167,3 +168,3 @@ void POP3wrapper::login() | |||
167 | ; // odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; | 168 | ; // odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; |
168 | Global::statusMessage(tr("Error %1 initializing folder").arg( err )); | 169 | Global::statusMessage(i18n("Error %1 initializing folder").arg( err )); |
169 | mailstorage_free(m_pop3); | 170 | mailstorage_free(m_pop3); |
@@ -204,6 +205,6 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target) | |||
204 | QProgressBar wid ( count ); | 205 | QProgressBar wid ( count ); |
205 | wid.setCaption( tr("Deleting ...")); | 206 | wid.setCaption( i18n("Deleting ...")); |
206 | wid.show(); | 207 | wid.show(); |
207 | while (iii < count ) { | 208 | while (iii < count ) { |
208 | Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count)); | 209 | Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count)); |
209 | wid.setProgress( iii ); | 210 | wid.setProgress( iii ); |
@@ -215,3 +216,3 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target) | |||
215 | if (err != MAIL_NO_ERROR) { | 216 | if (err != MAIL_NO_ERROR) { |
216 | Global::statusMessage(tr("Error deleting mail")); | 217 | Global::statusMessage(i18n("Error deleting mail")); |
217 | } | 218 | } |
@@ -226,3 +227,3 @@ void POP3wrapper::deleteMail(const RecMailP&mail) { | |||
226 | if (err != MAIL_NO_ERROR) { | 227 | if (err != MAIL_NO_ERROR) { |
227 | Global::statusMessage(tr("error deleting mail")); | 228 | Global::statusMessage(i18n("error deleting mail")); |
228 | } | 229 | } |
@@ -241,3 +242,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) { | |||
241 | if (err != MAIL_NO_ERROR) { | 242 | if (err != MAIL_NO_ERROR) { |
242 | Global::statusMessage(tr("Error getting folder info")); | 243 | Global::statusMessage(i18n("Error getting folder info")); |
243 | return 0; | 244 | return 0; |
@@ -248,6 +249,6 @@ int POP3wrapper::deleteAllMail(const FolderP&) { | |||
248 | QProgressBar wid ( result ); | 249 | QProgressBar wid ( result ); |
249 | wid.setCaption( tr("Deleting ...")); | 250 | wid.setCaption( i18n("Deleting ...")); |
250 | wid.show(); | 251 | wid.show(); |
251 | for (unsigned int i = 0; i < result; ++i) { | 252 | for (unsigned int i = 0; i < result; ++i) { |
252 | Global::statusMessage(tr("Delete message %1 of %2").arg(i).arg(result)); | 253 | Global::statusMessage(i18n("Delete message %1 of %2").arg(i).arg(result)); |
253 | wid.setProgress( i ); | 254 | wid.setProgress( i ); |
@@ -258,3 +259,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) { | |||
258 | if (err != MAIL_NO_ERROR) { | 259 | if (err != MAIL_NO_ERROR) { |
259 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 260 | Global::statusMessage(i18n("Error deleting mail %1").arg(i+1)); |
260 | res=0; | 261 | 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 @@ | |||
16 | #include <libetpan/libetpan.h> | 16 | #include <libetpan/libetpan.h> |
17 | #include <klocale.h> | ||
17 | 18 | ||
@@ -46,39 +47,39 @@ QString SMTPwrapper::mailsmtpError( int errnum ) { | |||
46 | case MAILSMTP_NO_ERROR: | 47 | case MAILSMTP_NO_ERROR: |
47 | return tr( "No error" ); | 48 | return i18n( "No error" ); |
48 | case MAILSMTP_ERROR_UNEXPECTED_CODE: | 49 | case MAILSMTP_ERROR_UNEXPECTED_CODE: |
49 | return tr( "Unexpected error code" ); | 50 | return i18n( "Unexpected error code" ); |
50 | case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE: | 51 | case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE: |
51 | return tr( "Service not available" ); | 52 | return i18n( "Service not available" ); |
52 | case MAILSMTP_ERROR_STREAM: | 53 | case MAILSMTP_ERROR_STREAM: |
53 | return tr( "Stream error" ); | 54 | return i18n( "Stream error" ); |
54 | case MAILSMTP_ERROR_HOSTNAME: | 55 | case MAILSMTP_ERROR_HOSTNAME: |
55 | return tr( "gethostname() failed" ); | 56 | return i18n( "gethostname() failed" ); |
56 | case MAILSMTP_ERROR_NOT_IMPLEMENTED: | 57 | case MAILSMTP_ERROR_NOT_IMPLEMENTED: |
57 | return tr( "Not implemented" ); | 58 | return i18n( "Not implemented" ); |
58 | case MAILSMTP_ERROR_ACTION_NOT_TAKEN: | 59 | case MAILSMTP_ERROR_ACTION_NOT_TAKEN: |
59 | return tr( "Error, action not taken" ); | 60 | return i18n( "Error, action not taken" ); |
60 | case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION: | 61 | case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION: |
61 | return tr( "Data exceeds storage allocation" ); | 62 | return i18n( "Data exceeds storage allocation" ); |
62 | case MAILSMTP_ERROR_IN_PROCESSING: | 63 | case MAILSMTP_ERROR_IN_PROCESSING: |
63 | return tr( "Error in processing" ); | 64 | return i18n( "Error in processing" ); |
64 | case MAILSMTP_ERROR_STARTTLS_NOT_SUPPORTED: | 65 | case MAILSMTP_ERROR_STARTTLS_NOT_SUPPORTED: |
65 | return tr( "Starttls not supported" ); | 66 | return i18n( "Starttls not supported" ); |
66 | // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE: | 67 | // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE: |
67 | // return tr( "Insufficient system storage" ); | 68 | // return i18n( "Insufficient system storage" ); |
68 | case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE: | 69 | case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE: |
69 | return tr( "Mailbox unavailable" ); | 70 | return i18n( "Mailbox unavailable" ); |
70 | case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED: | 71 | case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED: |
71 | return tr( "Mailbox name not allowed" ); | 72 | return i18n( "Mailbox name not allowed" ); |
72 | case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND: | 73 | case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND: |
73 | return tr( "Bad command sequence" ); | 74 | return i18n( "Bad command sequence" ); |
74 | case MAILSMTP_ERROR_USER_NOT_LOCAL: | 75 | case MAILSMTP_ERROR_USER_NOT_LOCAL: |
75 | return tr( "User not local" ); | 76 | return i18n( "User not local" ); |
76 | case MAILSMTP_ERROR_TRANSACTION_FAILED: | 77 | case MAILSMTP_ERROR_TRANSACTION_FAILED: |
77 | return tr( "Transaction failed" ); | 78 | return i18n( "Transaction failed" ); |
78 | case MAILSMTP_ERROR_MEMORY: | 79 | case MAILSMTP_ERROR_MEMORY: |
79 | return tr( "Memory error" ); | 80 | return i18n( "Memory error" ); |
80 | case MAILSMTP_ERROR_CONNECTION_REFUSED: | 81 | case MAILSMTP_ERROR_CONNECTION_REFUSED: |
81 | return tr( "Connection refused" ); | 82 | return i18n( "Connection refused" ); |
82 | default: | 83 | default: |
83 | return tr( "Unknown error code" ); | 84 | return i18n( "Unknown error code" ); |
84 | } | 85 | } |
@@ -154,4 +155,4 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char* | |||
154 | if (failuremessage) { | 155 | if (failuremessage) { |
155 | QMessageBox::critical(0,tr("Error sending mail"), | 156 | QMessageBox::critical(0,i18n("Error sending mail"), |
156 | tr("<center>%1</center>").arg(failuremessage)); | 157 | i18n("<center>%1</center>").arg(failuremessage)); |
157 | } | 158 | } |
@@ -223,3 +224,3 @@ void SMTPwrapper::connect_server() | |||
223 | ; // odebug << "Error init connection" << oendl; | 224 | ; // odebug << "Error init connection" << oendl; |
224 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 225 | failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); |
225 | result = 0; | 226 | result = 0; |
@@ -232,3 +233,3 @@ void SMTPwrapper::connect_server() | |||
232 | result = 0; | 233 | result = 0; |
233 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 234 | failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); |
234 | } | 235 | } |
@@ -247,3 +248,3 @@ void SMTPwrapper::connect_server() | |||
247 | result = 0; | 248 | result = 0; |
248 | failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); | 249 | failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err)); |
249 | } | 250 | } |
@@ -263,3 +264,3 @@ void SMTPwrapper::connect_server() | |||
263 | result = 0; | 264 | result = 0; |
264 | failuretext=tr("Login aborted - storing mail to localfolder"); | 265 | failuretext=i18n("Login aborted - storing mail to localfolder"); |
265 | } | 266 | } |
@@ -275,3 +276,3 @@ void SMTPwrapper::connect_server() | |||
275 | } else { | 276 | } else { |
276 | failuretext = tr("Authentification failed"); | 277 | failuretext = i18n("Authentification failed"); |
277 | result = 0; | 278 | result = 0; |
@@ -302,3 +303,3 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
302 | if ( err != MAILSMTP_NO_ERROR ) { | 303 | if ( err != MAILSMTP_NO_ERROR ) { |
303 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); | 304 | failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err)); |
304 | result = 0; | 305 | result = 0; |
@@ -435,4 +436,4 @@ bool SMTPwrapper::flushOutbox() { | |||
435 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { | 436 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { |
436 | QMessageBox::critical(0,tr("Error sending mail"), | 437 | QMessageBox::critical(0,i18n("Error sending mail"), |
437 | tr("Error sending queued mail - breaking")); | 438 | i18n("Error sending queued mail - breaking")); |
438 | returnValue = false; | 439 | returnValue = false; |