3 files changed, 12 insertions, 12 deletions

diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index e8d3b1a..6b88f34 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -73,3 +73,3 @@ void IRCMessageParser::parse(IRCMessage *message) {
         }
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled numeric command : ")+QString::number(message->commandNumber())));
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled numeric command: %1").arg( QString::number(message->commandNumber()) )));
     } else if (message->isCTCP()) {
@@ -81,3 +81,3 @@ void IRCMessageParser::parse(IRCMessage *message) {
         }
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled ctcp command : ")+message->ctcpCommand()));
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled ctcp command: %1").arg( message->ctcpCommand())) );
     } else {
@@ -89,3 +89,3 @@ void IRCMessageParser::parse(IRCMessage *message) {
         }
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled literal command : ")+message->command()));
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received unhandled literal command: %1").arg( message->command()) ));
     }
@@ -130,3 +130,3 @@ void IRCMessageParser::parseLiteralJoin(IRCMessage *message) {
                 channel->addPerson(chanperson);
-                IRCOutput output(OUTPUT_OTHERJOIN, mask.nick() + tr(" joined channel ") + channelName);
+                IRCOutput output(OUTPUT_OTHERJOIN ,tr("%1 joined channel %2").arg( mask.nick() ).arg( channelName ));
                 output.addParam(channel);
@@ -150,3 +150,3 @@ void IRCMessageParser::parseLiteralPart(IRCMessage *message) {
             m_session->removeChannel(channel);
-            IRCOutput output(OUTPUT_SELFPART, tr("You left channel ") + channelName);
+            IRCOutput output(OUTPUT_SELFPART, tr("You left channel %1").arg( channelName ));
             output.addParam(channel);
@@ -158,3 +158,3 @@ void IRCMessageParser::parseLiteralPart(IRCMessage *message) {
                 channel->removePerson(person);
-                IRCOutput output(OUTPUT_OTHERPART, mask.nick() + tr(" left channel ") + channelName);
+                IRCOutput output(OUTPUT_OTHERPART, tr("%1 left channel %2").arg( mask.nick() ).arg( channelName) );
                 output.addParam(channel);
@@ -200,3 +200,3 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
         } else {
-            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel ") + message->param(0).lower()));
+            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) ));
         }
@@ -213,3 +213,3 @@ void IRCMessageParser::parseLiteralNick(IRCMessage *message) {
         m_session->m_server->setNick(message->param(0));
-        IRCOutput output(OUTPUT_NICKCHANGE, tr("You are now known as ")+message->param(0));
+        IRCOutput output(OUTPUT_NICKCHANGE, tr("You are now known as %1").arg( message->param(0)));
         output.addParam(0);
@@ -220,3 +220,3 @@ void IRCMessageParser::parseLiteralNick(IRCMessage *message) {
         if (person) {
-            IRCOutput output(OUTPUT_NICKCHANGE, mask.nick() + tr(" is now known as ") + message->param(0));
+            IRCOutput output(OUTPUT_NICKCHANGE, tr("%1 is now known as %2").arg( mask.nick() ).arg( message->param(0 )));
             output.addParam(person);
@@ -242,3 +242,3 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) {
         m_session->removePerson(person);
-        IRCOutput output(OUTPUT_QUIT, mask.nick() + tr(" has quit ") + "(" + message->param(0) + ")");
+        IRCOutput output(OUTPUT_QUIT, tr("%1 has quit (%2)" ).arg( mask.nick() ).arg( message->param(0) ));
         output.addParam(person);
diff --git a/noncore/net/opieirc/ircperson.cpp b/noncore/net/opieirc/ircperson.cpp
index 2f5b435..1dd2679 100644
--- a/noncore/net/opieirc/ircperson.cpp
+++ b/noncore/net/opieirc/ircperson.cpp
@@ -43,3 +43,3 @@ void IRCPerson::setHost(QString host) {
 }
-
+ // -- GETTER FUNCS --
 QString IRCPerson::nick() {
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index b110a5b..70d5445 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -11,3 +11,3 @@
 IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
-    setCaption("Settings");
+    setCaption(tr("Settings") );
     m_config = new Config("OpieIRC");