X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=9a678539deb168407b9560c9678f42afc8a2bd83;hp=8feb777a006e383125c3865d1ca24103083386f7;hb=02b4f33429788d35500454bfb5a8a9ab0a2a2b49;hpb=7c74d84b7684b2e7d96736a1122184c2ce19fcc7

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 8feb777a..9a678539 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -108,7 +108,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
 
   newChild(bufferItem);
 
-  // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+  // postprocess... this is necessary because Qt doesn't seem to like adding children which already have children on their own
   switch(bufferInfo.type()) {
   case BufferInfo::ChannelBuffer:
     {
@@ -235,7 +235,7 @@ void BufferItem::clearActivityLevel() {
   _firstUnreadMsgId = MsgId();
 
   // FIXME remove with core proto v11
-  if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) {
+  if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
     _markerLineMsgId = _lastSeenMsgId;
   }
 
@@ -319,7 +319,7 @@ void BufferItem::setLastSeenMsgId(MsgId msgId) {
   _lastSeenMsgId = msgId;
 
   // FIXME remove with core protocol v11
-  if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) {
+  if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
     if(!isCurrentBuffer())
       _markerLineMsgId = msgId;
   }
@@ -798,7 +798,7 @@ QString IrcUserItem::toolTip(int column) const {
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
   if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
   if(_ircUser->isAway()) {
-    toolTip[0].append(" is away");
+    toolTip[0].append(tr(" is away"));
     if(!_ircUser->awayMessage().isEmpty())
       toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
   }