X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=e51cc6b161bd16fe3b787253e9075db8c8ae431b;hb=92bc51670686fe3e2c7077e7114389d25cbbfe13;hp=371867dd84fd77fda4dcbda8865a9e4a7899c02e;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016;p=quassel.git diff --git a/src/common/message.cpp b/src/common/message.cpp index 371867dd..e51cc6b1 100644 --- a/src/common/message.cpp +++ b/src/common/message.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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;