author | llornkcor <llornkcor> | 2003-04-06 18:09:49 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-04-06 18:09:49 (UTC) |
commit | edbdd8c8df7ff99f4273ae0296386fecf4f3b189 (patch) (side-by-side diff) | |
tree | 4d4c68fbf014ff762c3d3402bcdec5814128037e | |
parent | 8bc3b4fff609fa7f4809173724ab197ec08e599a (diff) | |
download | opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.zip opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.tar.gz opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.tar.bz2 |
add some tr to status messages
-rw-r--r-- | noncore/net/mailit/popclient.cpp | 22 | ||||
-rw-r--r-- | noncore/net/mailit/smtpclient.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/popclient.cpp | 22 | ||||
-rw-r--r-- | noncore/unsupported/mailit/smtpclient.cpp | 8 |
4 files changed, 30 insertions, 30 deletions
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp index a406af2..2f14ed2 100644 --- a/noncore/net/mailit/popclient.cpp +++ b/noncore/net/mailit/popclient.cpp @@ -96,14 +96,14 @@ void PopClient::setSelectedMails(MailList *list) } void PopClient::connectionEstablished() { - emit updateStatus("Connection established"); + emit updateStatus(tr("Connection established")); } void PopClient::errorHandling(int status) { - emit updateStatus("Error Occured"); + emit updateStatus(tr("Error Occured")); emit errorOccurred(status); socket->close(); receiving = FALSE; } @@ -211,21 +211,21 @@ void PopClient::incomingData() status = Size; temp2.setNum(newMessages - lastSync); temp.setNum(messageCount - lastSync); if (!selected) { - emit updateStatus("Retrieving " + temp + "/" + temp2); + emit updateStatus(tr("Retrieving ") + temp + "/" + temp2); } else { //completing a previously closed transfer if ( (messageCount - lastSync) <= 0) { temp.setNum(messageCount); - emit updateStatus("Previous message " + temp); + emit updateStatus(tr("Previous message ") + temp); } else { - emit updateStatus("Completing message " + temp); + emit updateStatus(tr("Completing message ") + temp); } } break; } else { - emit updateStatus("No new Messages"); + emit updateStatus(tr("No new Messages")); status = Quit; } } //get size of message, eg "500 characters in message.." -> int 500 @@ -299,12 +299,12 @@ void PopClient::incomingData() status = Size; //completing a previously closed transfer if ( (messageCount - lastSync) <= 0) { temp.setNum(messageCount); - emit updateStatus("Previous message " + temp); + emit updateStatus(tr("Previous message ") + temp); } else { temp.setNum(messageCount - lastSync); - emit updateStatus("Completing message " + temp); + emit updateStatus(tr("Completing message ") + temp); } break; } else { newMessages--; @@ -314,9 +314,9 @@ void PopClient::incomingData() *stream << "LIST " << messageCount << "\r\n"; status = Size; temp2.setNum(newMessages - lastSync); temp.setNum(messageCount - lastSync); - emit updateStatus("Retrieving " + temp + "/" + temp2); + emit updateStatus(tr("Retrieving ") + temp + "/" + temp2); break; } } @@ -330,11 +330,11 @@ void PopClient::incomingData() status = Done; int newM = newMessages - lastSync; if (newM > 0) { temp.setNum(newM); - emit updateStatus(temp + " new messages"); + emit updateStatus(temp + tr(" new messages")); } else { - emit updateStatus("No new messages"); + emit updateStatus(tr("No new messages")); } socket->close(); receiving = FALSE; diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp index 7bb7933..3bdc072 100644 --- a/noncore/net/mailit/smtpclient.cpp +++ b/noncore/net/mailit/smtpclient.cpp @@ -49,9 +49,9 @@ void SmtpClient::newConnection(QString target, int port) status = Init; sending = TRUE; socket->connectToHost(target, port); - emit updateStatus("DNS lookup"); + emit updateStatus(tr("DNS lookup")); } void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body) { @@ -66,9 +66,9 @@ void SmtpClient::addMail(QString from, QString subject, QStringList to, QString } void SmtpClient::connectionEstablished() { - emit updateStatus("Connection established"); + emit updateStatus(tr("Connection established")); } void SmtpClient::errorHandling(int status) @@ -128,9 +128,9 @@ void SmtpClient::incomingData() case Data: { if (response[0] == '2') { *stream << "DATA\r\n"; status = Body; - emit updateStatus("Sending: " + mailPtr->subject); + emit updateStatus(tr("Sending: ") + mailPtr->subject); } else errorHandling(ErrUnknownResponse); break; } case Body: { @@ -150,9 +150,9 @@ void SmtpClient::incomingData() *stream << "QUIT\r\n"; status = Done; QString temp; temp.setNum(mailList.count()); - emit updateStatus("Sent " + temp + " messages"); + emit updateStatus(tr("Sent ") + temp + tr(" messages")); emit mailSent(); mailList.clear(); sending = FALSE; socket->close(); diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp index a406af2..2f14ed2 100644 --- a/noncore/unsupported/mailit/popclient.cpp +++ b/noncore/unsupported/mailit/popclient.cpp @@ -96,14 +96,14 @@ void PopClient::setSelectedMails(MailList *list) } void PopClient::connectionEstablished() { - emit updateStatus("Connection established"); + emit updateStatus(tr("Connection established")); } void PopClient::errorHandling(int status) { - emit updateStatus("Error Occured"); + emit updateStatus(tr("Error Occured")); emit errorOccurred(status); socket->close(); receiving = FALSE; } @@ -211,21 +211,21 @@ void PopClient::incomingData() status = Size; temp2.setNum(newMessages - lastSync); temp.setNum(messageCount - lastSync); if (!selected) { - emit updateStatus("Retrieving " + temp + "/" + temp2); + emit updateStatus(tr("Retrieving ") + temp + "/" + temp2); } else { //completing a previously closed transfer if ( (messageCount - lastSync) <= 0) { temp.setNum(messageCount); - emit updateStatus("Previous message " + temp); + emit updateStatus(tr("Previous message ") + temp); } else { - emit updateStatus("Completing message " + temp); + emit updateStatus(tr("Completing message ") + temp); } } break; } else { - emit updateStatus("No new Messages"); + emit updateStatus(tr("No new Messages")); status = Quit; } } //get size of message, eg "500 characters in message.." -> int 500 @@ -299,12 +299,12 @@ void PopClient::incomingData() status = Size; //completing a previously closed transfer if ( (messageCount - lastSync) <= 0) { temp.setNum(messageCount); - emit updateStatus("Previous message " + temp); + emit updateStatus(tr("Previous message ") + temp); } else { temp.setNum(messageCount - lastSync); - emit updateStatus("Completing message " + temp); + emit updateStatus(tr("Completing message ") + temp); } break; } else { newMessages--; @@ -314,9 +314,9 @@ void PopClient::incomingData() *stream << "LIST " << messageCount << "\r\n"; status = Size; temp2.setNum(newMessages - lastSync); temp.setNum(messageCount - lastSync); - emit updateStatus("Retrieving " + temp + "/" + temp2); + emit updateStatus(tr("Retrieving ") + temp + "/" + temp2); break; } } @@ -330,11 +330,11 @@ void PopClient::incomingData() status = Done; int newM = newMessages - lastSync; if (newM > 0) { temp.setNum(newM); - emit updateStatus(temp + " new messages"); + emit updateStatus(temp + tr(" new messages")); } else { - emit updateStatus("No new messages"); + emit updateStatus(tr("No new messages")); } socket->close(); receiving = FALSE; diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp index 7bb7933..3bdc072 100644 --- a/noncore/unsupported/mailit/smtpclient.cpp +++ b/noncore/unsupported/mailit/smtpclient.cpp @@ -49,9 +49,9 @@ void SmtpClient::newConnection(QString target, int port) status = Init; sending = TRUE; socket->connectToHost(target, port); - emit updateStatus("DNS lookup"); + emit updateStatus(tr("DNS lookup")); } void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body) { @@ -66,9 +66,9 @@ void SmtpClient::addMail(QString from, QString subject, QStringList to, QString } void SmtpClient::connectionEstablished() { - emit updateStatus("Connection established"); + emit updateStatus(tr("Connection established")); } void SmtpClient::errorHandling(int status) @@ -128,9 +128,9 @@ void SmtpClient::incomingData() case Data: { if (response[0] == '2') { *stream << "DATA\r\n"; status = Body; - emit updateStatus("Sending: " + mailPtr->subject); + emit updateStatus(tr("Sending: ") + mailPtr->subject); } else errorHandling(ErrUnknownResponse); break; } case Body: { @@ -150,9 +150,9 @@ void SmtpClient::incomingData() *stream << "QUIT\r\n"; status = Done; QString temp; temp.setNum(mailList.count()); - emit updateStatus("Sent " + temp + " messages"); + emit updateStatus(tr("Sent ") + temp + tr(" messages")); emit mailSent(); mailList.clear(); sending = FALSE; socket->close(); |