add some tr to status messages

author: llornkcor <llornkcor> 2003-04-06 18:09:49 (UTC)
committer: llornkcor <llornkcor> 2003-04-06 18:09:49 (UTC)
commit: edbdd8c8df7ff99f4273ae0296386fecf4f3b189 (patch) (unidiff)
tree: 4d4c68fbf014ff762c3d3402bcdec5814128037e
parent: 8bc3b4fff609fa7f4809173724ab197ec08e599a (diff)
download: opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.zip
opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.tar.gz
opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.tar.bz2
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
@@ -97,12 +97,12 @@ 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;
@@ -212,19 +212,19 @@ void PopClient::incomingData()
            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;
          }
        } 
@@ -300,10 +300,10 @@ void PopClient::incomingData()
                    //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 {
@@ -315,7 +315,7 @@ void PopClient::incomingData()
                  status = Size;
                  temp2.setNum(newMessages - lastSync);
                  temp.setNum(messageCount - lastSync);
-                  emit updateStatus("Retrieving " + temp + "/" + temp2);
+                  emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
                  
                  break;
                }
@@ -331,9 +331,9 @@ void PopClient::incomingData()
          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();
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
@@ -50,7 +50,7 @@ void SmtpClient::newConnection(QString target, int port)
  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)
@@ -67,7 +67,7 @@ void SmtpClient::addMail(QString from, QString subject, QStringList to, QString
 void SmtpClient::connectionEstablished()
 {
-  emit updateStatus("Connection established");
+  emit updateStatus(tr("Connection established"));
 }
@@ -129,7 +129,7 @@ void SmtpClient::incomingData()
          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;
        } 
@@ -151,7 +151,7 @@ void SmtpClient::incomingData()
            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;
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
@@ -97,12 +97,12 @@ 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;
@@ -212,19 +212,19 @@ void PopClient::incomingData()
            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;
          }
        } 
@@ -300,10 +300,10 @@ void PopClient::incomingData()
                    //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 {
@@ -315,7 +315,7 @@ void PopClient::incomingData()
                  status = Size;
                  temp2.setNum(newMessages - lastSync);
                  temp.setNum(messageCount - lastSync);
-                  emit updateStatus("Retrieving " + temp + "/" + temp2);
+                  emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
                  
                  break;
                }
@@ -331,9 +331,9 @@ void PopClient::incomingData()
          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();
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
@@ -50,7 +50,7 @@ void SmtpClient::newConnection(QString target, int port)
  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)
@@ -67,7 +67,7 @@ void SmtpClient::addMail(QString from, QString subject, QStringList to, QString
 void SmtpClient::connectionEstablished()
 {
-  emit updateStatus("Connection established");
+  emit updateStatus(tr("Connection established"));
 }
@@ -129,7 +129,7 @@ void SmtpClient::incomingData()
          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;
        } 
@@ -151,7 +151,7 @@ void SmtpClient::incomingData()
            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;
author	llornkcor <llornkcor>	2003-04-06 18:09:49 (UTC)
committer	llornkcor <llornkcor>	2003-04-06 18:09:49 (UTC)
commit	edbdd8c8df7ff99f4273ae0296386fecf4f3b189 (patch) (unidiff)
tree	4d4c68fbf014ff762c3d3402bcdec5814128037e
parent	8bc3b4fff609fa7f4809173724ab197ec08e599a (diff)
download	opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.zip opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.tar.gz opie-edbdd8c8df7ff99f4273ae0296386fecf4f3b189.tar.bz2

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
@@ -97,12 +97,12 @@ void PopClient::setSelectedMails(MailList *list)
97		97
98	void PopClient::connectionEstablished()	98	void PopClient::connectionEstablished()
99	{	99	{
100	emit updateStatus("Connection established");	100	emit updateStatus(tr("Connection established"));
101	}	101	}
102		102
103	void PopClient::errorHandling(int status)	103	void PopClient::errorHandling(int status)
104	{	104	{
105	emit updateStatus("Error Occured");	105	emit updateStatus(tr("Error Occured"));
106	emit errorOccurred(status);	106	emit errorOccurred(status);
107	socket->close();	107	socket->close();
108	receiving = FALSE;	108	receiving = FALSE;
@@ -212,19 +212,19 @@ void PopClient::incomingData()
212	temp2.setNum(newMessages - lastSync);	212	temp2.setNum(newMessages - lastSync);
213	temp.setNum(messageCount - lastSync);	213	temp.setNum(messageCount - lastSync);
214	if (!selected) {	214	if (!selected) {
215	emit updateStatus("Retrieving " + temp + "/" + temp2);	215	emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
216	} else {	216	} else {
217	//completing a previously closed transfer	217	//completing a previously closed transfer
218	if ( (messageCount - lastSync) <= 0) {	218	if ( (messageCount - lastSync) <= 0) {
219	temp.setNum(messageCount);	219	temp.setNum(messageCount);
220	emit updateStatus("Previous message " + temp);	220	emit updateStatus(tr("Previous message ") + temp);
221	} else {	221	} else {
222	emit updateStatus("Completing message " + temp);	222	emit updateStatus(tr("Completing message ") + temp);
223	}	223	}
224	}	224	}
225	break;	225	break;
226	} else {	226	} else {
227	emit updateStatus("No new Messages");	227	emit updateStatus(tr("No new Messages"));
228	status = Quit;	228	status = Quit;
229	}	229	}
230	}	230	}
@@ -300,10 +300,10 @@ void PopClient::incomingData()
300	//completing a previously closed transfer	300	//completing a previously closed transfer
301	if ( (messageCount - lastSync) <= 0) {	301	if ( (messageCount - lastSync) <= 0) {
302	temp.setNum(messageCount);	302	temp.setNum(messageCount);
303	emit updateStatus("Previous message " + temp);	303	emit updateStatus(tr("Previous message ") + temp);
304	} else {	304	} else {
305	temp.setNum(messageCount - lastSync);	305	temp.setNum(messageCount - lastSync);
306	emit updateStatus("Completing message " + temp);	306	emit updateStatus(tr("Completing message ") + temp);
307	}	307	}
308	break;	308	break;
309	} else {	309	} else {
@@ -315,7 +315,7 @@ void PopClient::incomingData()
315	status = Size;	315	status = Size;
316	temp2.setNum(newMessages - lastSync);	316	temp2.setNum(newMessages - lastSync);
317	temp.setNum(messageCount - lastSync);	317	temp.setNum(messageCount - lastSync);
318	emit updateStatus("Retrieving " + temp + "/" + temp2);	318	emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
319		319
320	break;	320	break;
321	}	321	}
@@ -331,9 +331,9 @@ void PopClient::incomingData()
331	int newM = newMessages - lastSync;	331	int newM = newMessages - lastSync;
332	if (newM > 0) {	332	if (newM > 0) {
333	temp.setNum(newM);	333	temp.setNum(newM);
334	emit updateStatus(temp + " new messages");	334	emit updateStatus(temp + tr(" new messages"));
335	} else {	335	} else {
336	emit updateStatus("No new messages");	336	emit updateStatus(tr("No new messages"));
337	}	337	}
338		338
339	socket->close();	339	socket->close();


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
@@ -50,7 +50,7 @@ void SmtpClient::newConnection(QString target, int port)
50	sending = TRUE;	50	sending = TRUE;
51	socket->connectToHost(target, port);	51	socket->connectToHost(target, port);
52		52
53	emit updateStatus("DNS lookup");	53	emit updateStatus(tr("DNS lookup"));
54	}	54	}
55		55
56	void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body)	56	void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body)
@@ -67,7 +67,7 @@ void SmtpClient::addMail(QString from, QString subject, QStringList to, QString
67		67
68	void SmtpClient::connectionEstablished()	68	void SmtpClient::connectionEstablished()
69	{	69	{
70	emit updateStatus("Connection established");	70	emit updateStatus(tr("Connection established"));
71		71
72	}	72	}
73		73
@@ -129,7 +129,7 @@ void SmtpClient::incomingData()
129	if (response[0] == '2') {	129	if (response[0] == '2') {
130	*stream << "DATA\r\n";	130	*stream << "DATA\r\n";
131	status = Body;	131	status = Body;
132	emit updateStatus("Sending: " + mailPtr->subject);	132	emit updateStatus(tr("Sending: ") + mailPtr->subject);
133	} else errorHandling(ErrUnknownResponse);	133	} else errorHandling(ErrUnknownResponse);
134	break;	134	break;
135	}	135	}
@@ -151,7 +151,7 @@ void SmtpClient::incomingData()
151	status = Done;	151	status = Done;
152	QString temp;	152	QString temp;
153	temp.setNum(mailList.count());	153	temp.setNum(mailList.count());
154	emit updateStatus("Sent " + temp + " messages");	154	emit updateStatus(tr("Sent ") + temp + tr(" messages"));
155	emit mailSent();	155	emit mailSent();
156	mailList.clear();	156	mailList.clear();
157	sending = FALSE;	157	sending = FALSE;


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
@@ -97,12 +97,12 @@ void PopClient::setSelectedMails(MailList *list)
97		97
98	void PopClient::connectionEstablished()	98	void PopClient::connectionEstablished()
99	{	99	{
100	emit updateStatus("Connection established");	100	emit updateStatus(tr("Connection established"));
101	}	101	}
102		102
103	void PopClient::errorHandling(int status)	103	void PopClient::errorHandling(int status)
104	{	104	{
105	emit updateStatus("Error Occured");	105	emit updateStatus(tr("Error Occured"));
106	emit errorOccurred(status);	106	emit errorOccurred(status);
107	socket->close();	107	socket->close();
108	receiving = FALSE;	108	receiving = FALSE;
@@ -212,19 +212,19 @@ void PopClient::incomingData()
212	temp2.setNum(newMessages - lastSync);	212	temp2.setNum(newMessages - lastSync);
213	temp.setNum(messageCount - lastSync);	213	temp.setNum(messageCount - lastSync);
214	if (!selected) {	214	if (!selected) {
215	emit updateStatus("Retrieving " + temp + "/" + temp2);	215	emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
216	} else {	216	} else {
217	//completing a previously closed transfer	217	//completing a previously closed transfer
218	if ( (messageCount - lastSync) <= 0) {	218	if ( (messageCount - lastSync) <= 0) {
219	temp.setNum(messageCount);	219	temp.setNum(messageCount);
220	emit updateStatus("Previous message " + temp);	220	emit updateStatus(tr("Previous message ") + temp);
221	} else {	221	} else {
222	emit updateStatus("Completing message " + temp);	222	emit updateStatus(tr("Completing message ") + temp);
223	}	223	}
224	}	224	}
225	break;	225	break;
226	} else {	226	} else {
227	emit updateStatus("No new Messages");	227	emit updateStatus(tr("No new Messages"));
228	status = Quit;	228	status = Quit;
229	}	229	}
230	}	230	}
@@ -300,10 +300,10 @@ void PopClient::incomingData()
300	//completing a previously closed transfer	300	//completing a previously closed transfer
301	if ( (messageCount - lastSync) <= 0) {	301	if ( (messageCount - lastSync) <= 0) {
302	temp.setNum(messageCount);	302	temp.setNum(messageCount);
303	emit updateStatus("Previous message " + temp);	303	emit updateStatus(tr("Previous message ") + temp);
304	} else {	304	} else {
305	temp.setNum(messageCount - lastSync);	305	temp.setNum(messageCount - lastSync);
306	emit updateStatus("Completing message " + temp);	306	emit updateStatus(tr("Completing message ") + temp);
307	}	307	}
308	break;	308	break;
309	} else {	309	} else {
@@ -315,7 +315,7 @@ void PopClient::incomingData()
315	status = Size;	315	status = Size;
316	temp2.setNum(newMessages - lastSync);	316	temp2.setNum(newMessages - lastSync);
317	temp.setNum(messageCount - lastSync);	317	temp.setNum(messageCount - lastSync);
318	emit updateStatus("Retrieving " + temp + "/" + temp2);	318	emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
319		319
320	break;	320	break;
321	}	321	}
@@ -331,9 +331,9 @@ void PopClient::incomingData()
331	int newM = newMessages - lastSync;	331	int newM = newMessages - lastSync;
332	if (newM > 0) {	332	if (newM > 0) {
333	temp.setNum(newM);	333	temp.setNum(newM);
334	emit updateStatus(temp + " new messages");	334	emit updateStatus(temp + tr(" new messages"));
335	} else {	335	} else {
336	emit updateStatus("No new messages");	336	emit updateStatus(tr("No new messages"));
337	}	337	}
338		338
339	socket->close();	339	socket->close();


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
@@ -50,7 +50,7 @@ void SmtpClient::newConnection(QString target, int port)
50	sending = TRUE;	50	sending = TRUE;
51	socket->connectToHost(target, port);	51	socket->connectToHost(target, port);
52		52
53	emit updateStatus("DNS lookup");	53	emit updateStatus(tr("DNS lookup"));
54	}	54	}
55		55
56	void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body)	56	void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body)
@@ -67,7 +67,7 @@ void SmtpClient::addMail(QString from, QString subject, QStringList to, QString
67		67
68	void SmtpClient::connectionEstablished()	68	void SmtpClient::connectionEstablished()
69	{	69	{
70	emit updateStatus("Connection established");	70	emit updateStatus(tr("Connection established"));
71		71
72	}	72	}
73		73
@@ -129,7 +129,7 @@ void SmtpClient::incomingData()
129	if (response[0] == '2') {	129	if (response[0] == '2') {
130	*stream << "DATA\r\n";	130	*stream << "DATA\r\n";
131	status = Body;	131	status = Body;
132	emit updateStatus("Sending: " + mailPtr->subject);	132	emit updateStatus(tr("Sending: ") + mailPtr->subject);
133	} else errorHandling(ErrUnknownResponse);	133	} else errorHandling(ErrUnknownResponse);
134	break;	134	break;
135	}	135	}
@@ -151,7 +151,7 @@ void SmtpClient::incomingData()
151	status = Done;	151	status = Done;
152	QString temp;	152	QString temp;
153	temp.setNum(mailList.count());	153	temp.setNum(mailList.count());
154	emit updateStatus("Sent " + temp + " messages");	154	emit updateStatus(tr("Sent ") + temp + tr(" messages"));
155	emit mailSent();	155	emit mailSent();
156	mailList.clear();	156	mailList.clear();
157	sending = FALSE;	157	sending = FALSE;