X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=3a8dbc626653e1345fa2c2142fa228a4604e5cfa;hp=fc4dfccbeaa470467be30c277092cb201c46aacb;hb=b3402ef6dd801ffb14b1d0227469d832dd7f574e;hpb=70706ff642683d03ff091cab25d984ec7d9612de

diff --git a/src/common/message.cpp b/src/common/message.cpp
index fc4dfccb..3a8dbc62 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Development Team             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -149,21 +149,21 @@ void Message::format() {
     break;
     case Message::Nick:
       s = tr("%Dr<->");
-      if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(text());
-      else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, text());
+      if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt);
+      else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, txt);
       break;
     case Message::Mode:
       s = tr("%Dm***");
       if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(text());
-      else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(text(), nick);
+      else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(txt, nick);
       break;
     case Message::Action:
       s = tr("%Da-*-");
-      t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(text());
+      t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(txt);
       break;
     default:
       s = tr("%De%1").arg(sender());
-      t = tr("%De[%1]").arg(text());
+      t = tr("%De[%1]").arg(txt);
   }
   _formattedSender = s;
   _formattedText = t;