From 98794ee94af2fdb322f1a56b564e01ac7947d87c Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Sun, 23 Aug 2026 15:50:15 +0200
Subject: Revert "Use FS for translatable KVIrc control sequences"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although using a special control character FS seemed like a good way
to go, some editors, including Weblate, have problems with such
characters. Therefore, a different solution will be used.

This reverts commit 3ee568fa40a7902033b4a47c08cd24ca770b1681.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 src/kvirc/kernel/kvi_notifylist.cpp           |  12 +-
 src/kvirc/sparser/kvi_sp_ctcp.cpp             |  20 +-
 src/kvirc/sparser/kvi_sp_literal.cpp          |  76 ++---
 src/kvirc/sparser/kvi_sp_numeric.cpp          |  70 ++---
 src/kvirc/ui/kvi_ircview.cpp                  |  55 ++--
 src/kvirc/ui/kvi_query.cpp                    |   6 +-
 src/modules/dcc/broker.cpp                    |   2 +-
 src/modules/dcc/requests.cpp                  |   2 +-
 src/modules/dcc/send.cpp                      |   2 +-
 translations/messages/kvirc-dcc/ca.po         |  12 +-
 translations/messages/kvirc-dcc/cs.po         |  12 +-
 translations/messages/kvirc-dcc/de.po         |  12 +-
 translations/messages/kvirc-dcc/es.po         |  12 +-
 translations/messages/kvirc-dcc/es_AR.po      |   6 +-
 translations/messages/kvirc-dcc/fi.po         |   6 +-
 translations/messages/kvirc-dcc/fr.po         |  12 +-
 translations/messages/kvirc-dcc/hu.po         |  12 +-
 translations/messages/kvirc-dcc/it.po         |  12 +-
 translations/messages/kvirc-dcc/kvirc-dcc.pot |   6 +-
 translations/messages/kvirc-dcc/pt.po         |  12 +-
 translations/messages/kvirc-dcc/pt_BR.po      |   8 +-
 translations/messages/kvirc-dcc/ru.po         |  14 +-
 translations/messages/kvirc-dcc/uk.po         |  14 +-
 translations/messages/kvirc/bg.po             | 180 +++++------
 translations/messages/kvirc/ca.po             | 350 ++++++++++-----------
 translations/messages/kvirc/cs.po             | 358 ++++++++++-----------
 translations/messages/kvirc/de.po             | 383 ++++++++++++-----------
 translations/messages/kvirc/es.po             | 366 +++++++++++-----------
 translations/messages/kvirc/es_AR.po          | 180 +++++------
 translations/messages/kvirc/fi.po             | 272 ++++++++--------
 translations/messages/kvirc/fr.po             | 360 ++++++++++-----------
 translations/messages/kvirc/hr.po             | 222 ++++++-------
 translations/messages/kvirc/hu.po             | 358 ++++++++++-----------
 translations/messages/kvirc/it.po             | 362 ++++++++++-----------
 translations/messages/kvirc/kvirc.pot         | 180 +++++------
 translations/messages/kvirc/nl.po             | 180 +++++------
 translations/messages/kvirc/pl.po             | 180 +++++------
 translations/messages/kvirc/pt.po             | 364 ++++++++++-----------
 translations/messages/kvirc/pt_BR.po          | 348 ++++++++++-----------
 translations/messages/kvirc/ru.po             | 435 +++++++++++++++-----------
 translations/messages/kvirc/sr.po             | 326 +++++++++----------
 translations/messages/kvirc/uk.po             | 360 ++++++++++-----------
 42 files changed, 3117 insertions(+), 3042 deletions(-)

diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index dedb0f54..aef09c47 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -683,7 +683,7 @@ bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const Kv
 				} else {
 					// has never been online
 					if(_OUTPUT_VERBOSE)
-						m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \034!n\034%Q\034 appears to be online, but the mask [%Q@\034!h\034%Q\034] does not match (registration mask does not match, or nickname is being used by someone else)"),&(mask.nick()),&(mask.user()),&(mask.host()));
+						m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (registration mask does not match, or nickname is being used by someone else)"),&(mask.nick()),&(mask.user()),&(mask.host()));
 				}
 			}
 		} else {
@@ -695,7 +695,7 @@ bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const Kv
 		}
 	} else {
 		// ops...unexpected inconsistency
-		m_pConsole->output(KVI_OUT_SYSTEMWARNING,__tr2qs("Notify list: Unexpected inconsistency, expected \034!n\034%Q\034 in the registered user DB"),&notifyString);
+		m_pConsole->output(KVI_OUT_SYSTEMWARNING,__tr2qs("Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered user DB"),&notifyString);
 	}
 	return true;
 }
@@ -857,7 +857,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
 		while(TQString * s = m_pUserhostList->first())
 		{
 			if(_OUTPUT_VERBOSE)
-				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \034!n\034%Q\034 appears to have gone offline before USERHOST reply was received, will recheck in the next loop"),s);
+				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply was received, will recheck in the next loop"),s);
 			m_pUserhostList->removeFirst();
 		}
 	
@@ -1187,7 +1187,7 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
 					// has never been online
 					if(_OUTPUT_VERBOSE)
 						m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
-							__tr2qs("Notify list: \034!n\034%Q\034 appears to be online, but the mask [%Q@\034!h\034%Q\034] does not match (watch: registration mask does not match, or nickname is being used by someone else)"),
+							__tr("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (watch: registration mask does not match, or nickname is being used by someone else)"),
 							&(mask.nick()),&(mask.user()),&(mask.host()));
 				}
 			}
@@ -1245,7 +1245,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg)
 			notifyOffLine(dnk,dus,dho,__tr2qs("removed from watch list"));
 		} else {
 			if(_OUTPUT_VERBOSE)
-				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Stopped watching for \034!n\034%Q\034"),&dnk);
+				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Stopped watching for \r!n\r%Q\r"),&dnk);
 		}
 		if(m_pRegUserDict->find(dnk))m_pRegUserDict->remove(dnk); // kill that
 
@@ -1261,7 +1261,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg)
 			{
 				// This is a reply to a /watch +something
 				if(_OUTPUT_VERBOSE)
-					m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \034!n\034%Q\034 is offline (watch)"),&dnk);
+					m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk);
 			} else {
 				// This is a RPL_LOGOFF for an user that has not matched the reg-mask
 				notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry"));
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index e383e276..df30fbbe 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -820,7 +820,7 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg)
 	{
 		if (KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpDcc))
 		{
-			msg->msg->console()->output(KVI_OUT_IGNORE,__tr2qs("Ignoring DCC from \034!nc\034%s\034 [%s@\034!h\034%s\034]"),
+			msg->msg->console()->output(KVI_OUT_IGNORE,__tr2qs("Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"),
 				KviTQString::toUtf8(msg->pSource->nick()).data(),
 				KviTQString::toUtf8(msg->pSource->user()).data(),
 				KviTQString::toUtf8(msg->pSource->host()).data()
@@ -837,7 +837,7 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg)
 			{
 				if (KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 				{
-					msg->msg->console()->output(KVI_OUT_IGNORE,__tr2qs("Ignoring CTCP from \034!nc\034%s\034 [%s@\034!h\034%s\034]"),
+					msg->msg->console()->output(KVI_OUT_IGNORE,__tr2qs("Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"),
 						KviTQString::toUtf8(msg->pSource->nick()).data(),
 						KviTQString::toUtf8(msg->pSource->user()).data(),
 						KviTQString::toUtf8(msg->pSource->host()).data()
@@ -986,7 +986,7 @@ void KviServerParser::echoCtcpReply(KviCtcpMessage * msg)
 
 		pOut->output(
 			msg->bUnknown ? KVI_OUT_CTCPREPLYUNKNOWN : KVI_OUT_CTCPREPLY,
-			__tr2qs("%Q %Q reply from \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+			__tr2qs("%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 			&szWhat,&(msg->szTag),&(msg->pSource->nick()),&(msg->pSource->user()),
 			&(msg->pSource->host()),&szData);
 	}
@@ -1030,7 +1030,7 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg)
 			TQString szData = msg->msg->connection()->decodeText(msg->pData);
 			if(!KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpFlood,pOut,msg->pSource->nick(),msg->pSource->username(),msg->pSource->host(),msg->szTarget,msg->szTag,szData))
 				pOut->output(KVI_OUT_CTCPREQUESTFLOOD,
-					__tr2qs("%Q %Q%c request from \034!n\034%Q\034 [%Q@\034!h\034%Q\034] (%Q), ignored (flood limit exceeded)"),
+					__tr2qs("%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit exceeded)"),
 					&szWhat,&szTag,KVI_TEXT_RESET,&(msg->pSource->nick()),
 					&(msg->pSource->user()),&(msg->pSource->host()),&szRequest);
 		} else {
@@ -1039,7 +1039,7 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg)
 			pOut->output(
 				msg->bUnknown ? KVI_OUT_CTCPREQUESTUNKNOWN : 
 					(msg->bIgnored ? KVI_OUT_CTCPREQUESTIGNORED : KVI_OUT_CTCPREQUESTREPLIED),
-				__tr2qs("%Q %Q%c request from \034!n\034%Q\034 [%Q@\034!h\034%Q\034] (%Q), %Q"),
+				__tr2qs("%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"),
 				&szWhat,&szTag,KVI_TEXT_RESET,&(msg->pSource->nick()),
 				&(msg->pSource->user()),&(msg->pSource->host()),&szRequest,&szAction);
 		}
@@ -1130,7 +1130,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg)
 
 		pOut->output(
 			msg->bUnknown ? KVI_OUT_CTCPREPLYUNKNOWN : KVI_OUT_CTCPREPLY,
-			__tr2qs("%Q PING reply from \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %u sec %u msec"),
+			__tr2qs("%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"),
 			&szWhat,&(msg->pSource->nick()),
 			&(msg->pSource->user()),&(msg->pSource->host()),uDiffSecs,uDiffMSecs);
 	}
@@ -1457,7 +1457,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 		}
 		KviStr buffer1,buffer2;
 		pOut->output(type,
-			__tr2qs("CTCP ACTION from \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+			__tr2qs("CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 			&(msg->pSource->nick()),&(msg->pSource->user()),
 			&(msg->pSource->host()),&szData);
 	}
@@ -1703,7 +1703,7 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg)
 			if (KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 			{
 				msg->msg->console()->output(KVI_OUT_DCCREQUEST,
-					__tr2qs("Ignoring DCC %S request from \034!n\034%Q\034 [%Q@\034!h\034%Q\034] (%Q %S)"),
+					__tr2qs("Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"),
 					&p.szType,&(msg->pSource->nick()),
 					&(msg->pSource->user()),&(msg->pSource->host()),
 					&msg->szTag,&aux);
@@ -1717,7 +1717,7 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg)
 		if(!msg->msg->haltOutput())
 		{
 			msg->msg->console()->output(KVI_OUT_DCCREQUEST,
-				__tr2qs("Ignoring DCC %S request from \034!n\034%Q\034 [%Q@\034!h\034%Q\034] (%Q %S)"),
+				__tr2qs("Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"),
 				&p.szType,&(msg->pSource->nick()),
 				&(msg->pSource->user()),&(msg->pSource->host()),
 				&msg->szTag,&aux);
@@ -1745,7 +1745,7 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg)
 		{
 			TQString decoded = msg->msg->console()->decodeText(p.szType.ptr());
 			msg->msg->console()->output(KVI_OUT_DCCREQUEST,
-				__tr2qs("Processing DCC %Q request from \034!n\034%Q\034 [%Q@\034!h\034%Q\034] (%Q %s)"),
+				__tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"),
 				&decoded,&(msg->pSource->nick()),
 				&(msg->pSource->user()),&(msg->pSource->host()),
 				&msg->szTag,
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index db899a55..08992496 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -97,7 +97,7 @@ void KviServerParser::parseLiteralPing(KviIrcMessage *msg)
 	if((!msg->haltOutput()) && KVI_OPTION_BOOL(KviOption_boolShowPingPong))
 	{
 		msg->console()->output(KVI_OUT_SERVERPING,
-			__tr2qs("Received ping from \034!s\034%Q\034 (PING %Q), replied pong"),
+			__tr2qs("Received ping from \r!s\r%Q\r (PING %Q), replied pong"),
 			&szPrefix,&szAllParams);
 	}
 }
@@ -124,7 +124,7 @@ void KviServerParser::parseLiteralPong(KviIrcMessage *msg)
 	if((!msg->haltOutput()) && KVI_OPTION_BOOL(KviOption_boolShowPingPong))
 	{
 		msg->console()->output(KVI_OUT_SERVERPING,
-			__tr2qs("Received pong from \034!s\034%s\034 (PONG %s)"),msg->safePrefix(),msg->allParams());
+			__tr2qs("Received pong from \r!s\r%s\r (PONG %s)"),msg->safePrefix(),msg->allParams());
 	}
 }
 
@@ -304,12 +304,12 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
 		if(chExtMode != 0)
 		{
 			chan->output(KVI_OUT_JOIN,
-				__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has joined \034!c\034%Q\034 [implicit +%c umode change]"),
+				__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"),
 				&szNick,&szUser,&szHost,&channel,chExtMode);
 
 		} else {
 			chan->output(KVI_OUT_JOIN,
-				__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has joined \034!c\034%Q\034"),
+				__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"),
 				&szNick,&szUser,&szHost,&channel);
 		}
 	}
@@ -323,7 +323,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
 		{
 			q->output(KVI_OUT_QUERYTRACE,
-				__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has just joined \034!c\034%Q\034"),&szNick,&szUser,
+				__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"),&szNick,&szUser,
 				&szHost,&channel);
 			q->notifyCommonChannels(szNick,szUser,szHost,iChans,szChans);
 		} else {
@@ -383,9 +383,9 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
 			if(KVI_OPTION_BOOL(KviOption_boolShowOwnParts))
 			{
 				if(partMsg.isEmpty())
-					pOut->output(KVI_OUT_PART,__tr2qs("You have left channel \034!c\034%Q\034"),&szChan);
+					pOut->output(KVI_OUT_PART,__tr2qs("You have left channel \r!c\r%Q\r"),&szChan);
 				else
-					pOut->output(KVI_OUT_PART,__tr2qs("You have left channel \034!c\034%Q\034: %Q"),&szChan,&partMsg);
+					pOut->output(KVI_OUT_PART,__tr2qs("You have left channel \r!c\r%Q\r: %Q"),&szChan,&partMsg);
 			}
 		}
 
@@ -401,11 +401,11 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
 		{
 			if(!partMsg.isEmpty())
 				chan->output(KVI_OUT_PART,
-					__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has left \034!c\034%Q\034: %Q"),&szNick,&szUser,
+					__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"),&szNick,&szUser,
 					&szHost,&szChan,&partMsg);
 			else
 				chan->output(KVI_OUT_PART,
-					__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has left \034!c\034%Q\034"),&szNick,&szUser,
+					__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"),&szNick,&szUser,
 					&szHost,&szChan);
 
 		}
@@ -419,11 +419,11 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
 			{
 				if(!partMsg.isEmpty())
 					q->output(KVI_OUT_QUERYTRACE,
-						__tr2qs("\034!nc\034%Q\034 [%Q@\034!h\034%Q\034] has just left \034!c\034%Q\034: %Q"),
+						__tr2qs("\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"),
 						&szNick,&szUser,&szHost,&szChan,&partMsg);
 				else
 					q->output(KVI_OUT_QUERYTRACE,
-						__tr2qs("\034!nc\034%Q\034 [%Q@\034!h\034%Q\034] has just left \034!c\034%Q\034"),
+						__tr2qs("\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"),
 						&szNick,&szUser,&szHost,&szChan);
 				q->notifyCommonChannels(szNick,szUser,szHost,iChans,szChans);
 			}
@@ -545,7 +545,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
 				}
 
 				if(!msg->haltOutput())c->output(KVI_OUT_QUIT,
-						__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has quit IRC: %Q"),
+						__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"),
 						&szNick,&szUser,&szHost,&quitMsg);
 			}
 		}
@@ -561,7 +561,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
 			{
 				quitMsg.prepend("NETSPLIT ");
 			}
-			q->output(KVI_OUT_QUIT,__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has quit IRC: %Q"),
+			q->output(KVI_OUT_QUIT,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"),
 					&szNick,&szUser,&szHost,&quitMsg);
 		}
 	}
@@ -615,7 +615,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 			{
 				// FIXME: #warning "OPTION FOR THIS TO GO TO THE CONSOLE!"
 				chan->output(KVI_OUT_MEKICK,
-					__tr2qs("You have been kicked from \034!c\034%Q\034 by \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+					__tr2qs("You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 					&szChan,&szNick,&szUser,&szHost,&szKickMsg);
 			}
 		} else {
@@ -625,14 +625,14 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 			{
 				// FIXME: #warning "This could go also to the active window!"
 				console->output(KVI_OUT_MEKICK,
-					__tr2qs("You have been kicked from \034!c\034%Q\034 by \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+					__tr2qs("You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 					&szChan,&szNick,&szUser,&szHost,&szKickMsg);
 			}
 		}
 		if(KVI_OPTION_BOOL(KviOption_boolRejoinChannelOnKick))
 		{
 			if(_OUTPUT_VERBOSE)
-				console->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to rejoin \034!c\034%Q\034..."),&szChan);
+				console->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to rejoin \r!c\r%Q\r..."),&szChan);
 			KviTQCString szC = msg->connection()->encodeText(szChan);
 			if(!szPass.isEmpty())
 			{
@@ -669,7 +669,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 		{
 // FIXME: #warning "OPTION FOR THIS TO GO TO THE CONSOLE!"
 			chan->output(KVI_OUT_KICK,
-				__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has been kicked from \034!c\034%Q\034 by \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+				__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 				&victim,&szVUser,&szVHost,&szChan,&szNick,&szUser,&szHost,&szKickMsg);
 		}
 
@@ -681,7 +681,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 				TQString szChans;
 				int iChans = console->connection()->getCommonChannels(victim,szChans);
 				q->output(KVI_OUT_QUERYTRACE,
-					__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has just been kicked from \034!c\034%Q\034 by \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+					__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 					&victim,&szVUser,&szVHost,&szChan,
 					&szNick,&szUser,&szHost,&szKickMsg);
 				q->notifyCommonChannels(victim,szVUser,szVHost,iChans,szChans);
@@ -775,7 +775,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 
 				if (KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 				{
-					console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring query-PRIVMSG from \034!nc\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),&szNick,&szUser,&szHost,&szMsg);
+					console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),&szNick,&szUser,&szHost,&szMsg);
 				}
 				return;
 			}
@@ -842,7 +842,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 						{
 							TQString szMsg = msg->connection()->decodeText(msg->safeTrailing());
 							console->output(KVI_OUT_SPAM,
-								__tr2qs("Spam privmsg from \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q (matching spamword \"%s\")"),
+								__tr2qs("Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"),
 								&szNick,&szUser,&szHost,&szMsg,spamWord.ptr());
 						}
 						return;
@@ -976,7 +976,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 
 				if (KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 				{
-					console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring channel-PRIVMSG from \034!nc\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),&szNick,&szUser,&szHost,&szMsg);
+					console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),&szNick,&szUser,&szHost,&szMsg);
 				}
 				return;
 			}
@@ -1098,7 +1098,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 			if(KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 			{
 				TQString szMsg = msg->connection()->decodeText(msg->safeTrailing());
-				console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring Notice from \034!nc\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),&szNick,&szUser,&szHost,&szMsg);
+				console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),&szNick,&szUser,&szHost,&szMsg);
 			}
 			return;
 		}
@@ -1205,7 +1205,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 						{
 							TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing());
 							TQString szSpamWord = spamWord.ptr();
-							console->output(KVI_OUT_SPAM,__tr2qs("Spam notice from \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q (matching spamword \"%Q\")"),
+							console->output(KVI_OUT_SPAM,__tr2qs("Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"),
 								&szNick,&szUser,&szHost,&szMsgText,&szSpamWord);
 						}
 						return;
@@ -1398,7 +1398,7 @@ void KviServerParser::parseLiteralTopic(KviIrcMessage *msg)
 	if(!msg->haltOutput())
 	{
 		chan->output(KVI_OUT_TOPIC,
-			__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] has changed topic to \"%Q%c\""),
+			__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""),
 			&szNick,&szUser,&szHost,&szTopic,KVI_TEXT_RESET);
 	}
 }
@@ -1431,7 +1431,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
 		if(c->nickChange(szNick,szNewNick))
 		{
 			if(!msg->haltOutput())
-				c->output(KVI_OUT_NICK,__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] is now known as \034!n\034%Q\034"),
+				c->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"),
 					&szNick,&szUser,&szHost,&szNewNick);
 			// FIXME if(bIsMe)output(YOU ARE now known as.. ?)
 		}
@@ -1462,7 +1462,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing) && (!_OUTPUT_QUIET))
 		{
 		old->output(KVI_OUT_QUERYTRACE,
-			__tr2qs("The target of this query was lost and has been found when \034!n\034%Q\034 [%Q@\034!h\034%Q\034] changed his nickname to \034!n\034%Q\034"),
+			__tr2qs("The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h\r%Q\r] changed his nickname to \r!n\r%Q\r"),
 			&szNick,&szUser,&szHost,&szNewNick);
 		}
 		if(q)
@@ -1471,13 +1471,13 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
 			if(!_OUTPUT_MUTE)
 				{
 				old->output(KVI_OUT_SYSTEMWARNING,
-						__tr2qs("The recent nickname change from \034!n\034%Q\034 to \034!n\034%Q\034 caused a query collision: merging output"),
+						__tr2qs("The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query collision: merging output"),
 						&szNick,&szNewNick);
 			}
 				old->mergeQuery(q);
 			q->frame()->closeWindow(q); // deleted path
 			if(!msg->haltOutput())
-					old->output(KVI_OUT_NICK,__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] is now known as \034!n\034%Q\034"),
+					old->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"),
 					&szNick,&szUser,&szHost,&szNewNick);
 			if(!_OUTPUT_MUTE)
 				old->output(KVI_OUT_SYSTEMWARNING,__tr2qs("End of merged output"));
@@ -1497,7 +1497,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
 			if(!q->nickChange(szNick,szNewNick))
 					tqDebug("Internal error: query %s failed to change nick from %s to %s",szNick.local8Bit().data(),szNick.local8Bit().data(),szNewNick.local8Bit().data());
 			if(!msg->haltOutput())
-				q->output(KVI_OUT_NICK,__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] is now known as \034!n\034%Q\034"),
+				q->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"),
 					&szNick,&szUser,&szHost,&szNewNick);
 			q->userAction(szNewNick,szUser,szHost,KVI_USERACTION_NICK);
 		}
@@ -1525,7 +1525,7 @@ void KviServerParser::parseLiteralInvite(KviIrcMessage *msg)
 		{
 			if(KVI_OPTION_BOOL(KviOption_boolVerboseIgnore))
 			{
-				console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring invite from \034!nc\034%Q\034 [%Q@\034!h\034%Q\034]"),&szNick,&szUser,&szHost);
+				console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"),&szNick,&szUser,&szHost);
 			}
 			return;
 		}
@@ -1541,7 +1541,7 @@ void KviServerParser::parseLiteralInvite(KviIrcMessage *msg)
 			KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolInvitesToActiveWindow) ?
 				msg->console()->activeWindow() : (KviWindow *)(msg->console());
 			TQString szAction = KVI_OPTION_BOOL(KviOption_boolAutoJoinOnInvite) ? __tr2qs("autojoining") : __tr2qs("double-click the channel name to join");
-			pOut->output(KVI_OUT_INVITE,__tr2qs("\034!n\034%Q\034 [%Q@\034!h\034%Q\034] invites you to channel \034!c\034%Q\034 (%Q)"),
+			pOut->output(KVI_OUT_INVITE,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"),
 				&szNick,&szUser,&szHost,&szChannel,&szAction);
 		}
 
@@ -1569,7 +1569,7 @@ void KviServerParser::parseLiteralWallops(KviIrcMessage *msg)
 	{
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolOperatorMessagesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_WALLOPS,__tr2qs("WALLOPS from \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+		pOut->output(KVI_OUT_WALLOPS,__tr2qs("WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 			&szNick,&szUser,&szHost,&szMsg);
 	}
 }
@@ -1716,7 +1716,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 				if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges)))
 				{
 					if(bSet)chan->output(KVI_OUT_KEY,
-						__tr2qs("%Q [%Q@%Q] has set channel key to \"\034!m-k\034%Q\034\""),
+						__tr2qs("%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""),
 						&nickBuffer,&szUser,&hostBuffer,&aParam);
 					else chan->output(KVI_OUT_KEY,
 						__tr2qs("%Q [%Q@%Q] has unset the channel key"),
@@ -1739,7 +1739,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 				if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges)))
 				{
 					if(bSet)chan->output(KVI_OUT_LIMIT,
-						__tr2qs("%Q [%Q@%Q] has set channel \034!m-l\034limit to %Q\034"),
+						__tr2qs("%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"),
 						&nickBuffer,&szUser,&hostBuffer,&aParam);
 					else chan->output(KVI_OUT_LIMIT,
 						__tr2qs("%Q [%Q@%Q] has unset the channel limit"),
@@ -1764,7 +1764,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 					if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges))) \
 					{ \
 						chan->output(bSet ? (bIsMe ? __icomeset : __icoset) : (bIsMe ? __icomeunset : __icounset), \
-							__tr2qs("%Q [%Q@%Q] has set mode %c%c \034!n\034%Q\034"), \
+							__tr2qs("%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"), \
 							&nickBuffer,&szUser,&hostBuffer,bSet ? '+' : '-',__modechar,&aParam); \
 					} \
 				} else {\
@@ -1772,7 +1772,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 					if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges)))\
 					{\
 						chan->output(KVI_OUT_CHANMODE,\
-							__tr2qs("%Q [%Q@%Q] has set channel \034!m%c%c\034mode %c%c\034"),\
+							__tr2qs("%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"),\
 							&nickBuffer,&szUser,&hostBuffer,\
 							bSet ? '-' : '+',__modechar,bSet ? '+' : '-',__modechar);\
 					}\
@@ -1804,7 +1804,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 				if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges))) \
 				{ \
 					chan->output(bSet ? (bIsMe ? __icomeset : __icoset) : (bIsMe ? __icomeunset : __icounset), \
-						__tr2qs("%Q [%Q@%Q] has set mode %c%c \034!m%c%c\034%Q\034"), \
+						__tr2qs("%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"), \
 						&nickBuffer,&szUser,&hostBuffer, \
 						bSet ? '+' : '-',__modefl,bSet ? '-' : '+',__modefl,&aParam); \
 				} \
@@ -1819,7 +1819,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 				if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolShowCompactModeChanges)))
 				{
 					chan->output(KVI_OUT_CHANMODE,
-						__tr2qs("%Q [%Q@%Q] has set channel \034!m%c%c\034mode %c%c\034"),
+						__tr2qs("%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"),
 						&nickBuffer,&szUser,&hostBuffer,
 						bSet ? '-' : '+',*aux,bSet ? '+' : '-',*aux);
 				}
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 266fe2d8..f3429d6d 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -372,7 +372,7 @@ void KviServerParser::parseNumericEndOfNames(KviIrcMessage *msg)
 // FIXME: #warning "KVI_OUT_NAMES missing"
 		KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_UNHANDLED,__tr2qs("End of NAMES for \034!c\034%Q\034"),&szChan);
+		pOut->output(KVI_OUT_UNHANDLED,__tr2qs("End of NAMES for \r!c\r%Q\r"),&szChan);
 	}
 }
 
@@ -469,7 +469,7 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg)
 		KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		TQString szTrailing = trailing ? msg->connection()->decodeText(trailing) : TQString("");
-		pOut->output(KVI_OUT_UNHANDLED,__tr2qs("Names for \034!c\034%Q\034: %Q"),&szChan,&szTrailing);
+		pOut->output(KVI_OUT_UNHANDLED,__tr2qs("Names for \r!c\r%Q\r: %Q"),&szChan,&szTrailing);
 	}
 }
 
@@ -495,7 +495,7 @@ void KviServerParser::parseNumericTopic(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 
 		TQString szTopic = msg->connection()->decodeText(msg->safeTrailing());
-		pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \034!c\034%Q\034 is: %Q"),
+		pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \r!c\r%Q\r is: %Q"),
 			&szChan,&szTopic);
 	}
 
@@ -518,7 +518,7 @@ void KviServerParser::parseNumericNoTopic(KviIrcMessage *msg)
 	} else {
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_TOPIC,__tr2qs("No topic is set for channel \034!c\034%Q\034"),
+		pOut->output(KVI_OUT_TOPIC,__tr2qs("No topic is set for channel \r!c\r%Q\r"),
 			&szChan);
 	}
 }
@@ -566,10 +566,10 @@ void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		if(bOk)
 		{
-			pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \034!c\034%Q\034 was set by %Q on %Q"),
+			pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \r!c\r%Q\r was set by %Q on %Q"),
 					&szChan,&szDisplayableWho,&szDate);
 		} else {
-			pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \034!c\034%Q\034 was set by %Q"),
+			pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \r!c\r%Q\r was set by %Q"),
 					&szChan,&szDisplayableWho);
 		}
 	}
@@ -589,10 +589,10 @@ void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		if((!szChan.isEmpty()) && IS_CHANNEL_TYPE_FLAG(szChan[0]))
 		{
-			pOut->output(KVI_OUT_CHANMODE,__tr2qs("Channel mode for \034!c\034%Q\034 is %s"),
+			pOut->output(KVI_OUT_CHANMODE,__tr2qs("Channel mode for \r!c\r%Q\r is %s"),
 				&szChan,msg->safeParam(2));
 		} else {
-			pOut->output(KVI_OUT_MODE,__tr2qs("User mode for \034!n\034%Q\034 is %s"),
+			pOut->output(KVI_OUT_MODE,__tr2qs("User mode for \r!n\r%Q\r is %s"),
 				&szChan,msg->safeParam(2));
 		}
 	}
@@ -628,7 +628,7 @@ void getDateTimeStringFromCharTimeT(TQString &buffer,const char *time_t_string)
 		{ \
 			KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \
 				msg->console()->activeWindow() : (KviWindow *)(msg->console()); \
-			pOut->output(__daicon,__tr2qs("End of channel %Q for \034!c\034%Q\034"),&(__szWhatTQString),&szChan); \
+			pOut->output(__daicon,__tr2qs("End of channel %Q for \r!c\r%Q\r"),&(__szWhatTQString),&szChan); \
 		} \
 	}
 
@@ -655,7 +655,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
 		{ \
 			KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \
 				msg->console()->activeWindow() : (KviWindow *)(msg->console()); \
-			pOut->output(__ico,__tr2qs("%Q for \034!c\034%Q\034: \034!m-%c\034%Q\034 (set by %Q on %Q)"), \
+			pOut->output(__ico,__tr2qs("%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"), \
 				&(__szWhatTQString),&szChan,__modechar,&banmask,&bansetby,&bansetat); \
 		} \
 	}
@@ -737,7 +737,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 		TQString szAway = bAway ? __tr2qs("Yes") : __tr2qs("No");
 
 		pOut->output(KVI_OUT_WHO,
-			__tr2qs("WHO entry for %c\034!n\034%Q\034%c [%Q@\034!h\034%Q\034]: %cChannel%c: \034!c\034%Q\034, %cServer%c: \034!s\034%Q\034, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal name%c: %Q"),
+			__tr2qs("WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, %cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal name%c: %Q"),
 			KVI_TEXT_BOLD,&szNick, KVI_TEXT_BOLD, 
 			&szUser,&szHost,KVI_TEXT_UNDERLINE,
 			KVI_TEXT_UNDERLINE,&szChan,KVI_TEXT_UNDERLINE,
@@ -868,7 +868,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg)
 		TQString szActual = msg->connection()->decodeText(msg->safeParam(1));
 		TQString szWText = msg->connection()->decodeText(msg->safeTrailing());
 		msg->console()->output(KVI_OUT_NICKNAMEPROBLEM,
-			__tr2qs("No way to login as '\034!n\034%Q\034' (%d: %Q), trying '%Q'..."),
+			__tr2qs("No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."),
 				&szActual,msg->numeric(),&szWText,&nextNick);
 	}
 
@@ -1034,7 +1034,7 @@ void KviServerParser::parseNumericWhoisAway(KviIrcMessage * msg)
 
 		if(!pOut)pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_WHOISUSER,__tr2qs("%c\034!n\034%Q\034%c is away: %Q"),
+		pOut->output(KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c is away: %Q"),
 			KVI_TEXT_BOLD,&szNk,KVI_TEXT_BOLD,&szWText);
 	}
 }
@@ -1087,12 +1087,12 @@ void KviServerParser::parseNumericWhoisUser(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\034!n\034%Q\034%c is %c\034!n\034%Q\034!%Q@\034!h\034%Q\034%c"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"),KVI_TEXT_BOLD,
 				&szNick,KVI_TEXT_BOLD,KVI_TEXT_UNDERLINE,&szNick,
 				&szUser,&szHost,KVI_TEXT_UNDERLINE);
 
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\034!n\034%Q\034%c's real name: %Q"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name: %Q"),KVI_TEXT_BOLD,
 				&szNick,KVI_TEXT_BOLD,&szReal);
 	}
 }
@@ -1112,11 +1112,11 @@ void KviServerParser::parseNumericWhowasUser(KviIrcMessage * msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\034!n\034%Q\034%c was %c\034!n\034%Q\034!%Q@\034!h\034%Q\034%c"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,KVI_TEXT_UNDERLINE,&szNick,
 			&szUser,&szHost,KVI_TEXT_UNDERLINE);
 		pOut->output(
-			KVI_OUT_WHOISUSER,__tr2qs("%c\034!n\034%Q\034%c's real name was: %Q"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISUSER,__tr2qs("%c\r!n\r%Q\r%c's real name was: %Q"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,&szReal);
 	}
 }
@@ -1180,7 +1180,7 @@ void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg)
 		}
 
 		pOut->output(
-			KVI_OUT_WHOISCHANNELS,__tr2qs("%c\034!n\034%Q\034%c's channels: %Q"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISCHANNELS,__tr2qs("%c\r!n\r%Q\r%c's channels: %Q"),KVI_TEXT_BOLD,
 				&szNick,KVI_TEXT_BOLD,&szChanList);
 	}
 }
@@ -1227,7 +1227,7 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 		unsigned int uMins = uTime / 60;
 		uTime = uTime % 60;
 		pOut->output(
-			KVI_OUT_WHOISIDLE,__tr2qs("%c\034!n\034%Q\034%c's idle time: %ud %uh %um %us"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,uDays,uHours,uMins,uTime);
 
 		uTime = sign.toUInt(&bOk);
@@ -1237,7 +1237,7 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 			dt.setTime_t((time_t)uTime);
 			TQString tmp = dt.toString();
 			pOut->output(
-				KVI_OUT_WHOISIDLE,__tr2qs("%c\034!n\034%Q\034%c's signon time: %Q"),KVI_TEXT_BOLD,
+				KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KVI_TEXT_BOLD,
 				&szNick,KVI_TEXT_BOLD,&tmp);
 		}
 	}
@@ -1271,7 +1271,7 @@ void KviServerParser::parseNumericWhoisServer(KviIrcMessage *msg)
 		msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		TQString szWText = pOut->decodeText(msg->safeTrailing());
 		pOut->output(
-			KVI_OUT_WHOISSERVER,__tr2qs("%c\034!n\034%Q\034%c's server: \034!s\034%Q\034 - %Q"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISSERVER,__tr2qs("%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,&szServ,&szWText);
 	}
 }
@@ -1290,7 +1290,7 @@ void KviServerParser::parseNumericWhoisAuth(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\034!n\034%Q\034%c is authenticated as %Q"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c is authenticated as %Q"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,&szAuth);
 	}
 }
@@ -1322,7 +1322,7 @@ void KviServerParser::parseNumericWhoisOther(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\034!n\034%Q\034%c's info: %Q"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's info: %Q"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,&szOth);
 	}
 }
@@ -1369,7 +1369,7 @@ void KviServerParser::parseNumericEndOfWhois(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		TQString pref = msg->connection()->decodeText(msg->safePrefix());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\034!n\034%Q\034%c WHOIS info from \034!s\034%Q\034"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,&pref);
 	}
 }
@@ -1386,7 +1386,7 @@ void KviServerParser::parseNumericEndOfWhowas(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 		TQString pref = msg->connection()->decodeText(msg->safePrefix());
 		pOut->output(
-			KVI_OUT_WHOISOTHER,__tr2qs("%c\034!n\034%Q\034%c WHOWAS info from \034!s\034%Q\034"),KVI_TEXT_BOLD,
+			KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"),KVI_TEXT_BOLD,
 			&szNick,KVI_TEXT_BOLD,&pref);
 	}
 }
@@ -1467,7 +1467,7 @@ void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg)
 	} else {
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_CREATIONTIME,__tr2qs("Channel \034!c\034%Q\034 was created at %Q"),
+		pOut->output(KVI_OUT_CREATIONTIME,__tr2qs("Channel \r!c\r%Q\r was created at %Q"),
 			&szChan,&szDate);
 	}
 }
@@ -1759,7 +1759,7 @@ void KviServerParser::parseNumericServerAdminInfoServerName(KviIrcMessage * msg)
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 			TQString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\034!s\034%s\034%c's server info: %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data());
+			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's server info: %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data());
 	}
 }
 
@@ -1770,7 +1770,7 @@ void KviServerParser::parseNumericServerAdminInfoAdminName(KviIrcMessage * msg)
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 		TQString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\034!s\034%s\034%c's administrator is %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data());
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's administrator is %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data());
 	}
 }
 
@@ -1781,7 +1781,7 @@ void KviServerParser::parseNumericServerAdminInfoAdminContact(KviIrcMessage * ms
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 			TQString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\034!s\034%s\034%c's contact adress is %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data());
+			pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's contact adress is %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data());
 	}
 }
 
@@ -1806,10 +1806,10 @@ void KviServerParser::parseNumericInviting(KviIrcMessage * msg)
 		KviChannel * chan = msg->connection()->findChannel(szChan);
 		if(chan)
 		{
-			chan->output(KVI_OUT_INVITE,__tr2qs("\034!n\034%Q\034 invited %Q into channel %Q"),&szWho,&szTarget,&szChan);
+			chan->output(KVI_OUT_INVITE,__tr2qs("\r!n\r%Q\r invited %Q into channel %Q"),&szWho,&szTarget,&szChan);
 		} else {
 			KviWindow * pOut = (KviWindow *)(msg->console());
-			pOut->output(KVI_OUT_INVITE,__tr2qs("\034!n\034%Q\034 invited %Q into channel %Q"),&szWho,&szTarget,&szChan);
+			pOut->output(KVI_OUT_INVITE,__tr2qs("\r!n\r%Q\r invited %Q into channel %Q"),&szWho,&szTarget,&szChan);
 		}
 	}
 }
@@ -1831,7 +1831,7 @@ void KviServerParser::parseNumericInfoStart(KviIrcMessage * msg)
 	if(!msg->haltOutput())
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\034!s\034%s\034%c's information:"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's information:"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD);
 	}
 }
 
@@ -1841,7 +1841,7 @@ void KviServerParser::parseNumericInfoEnd(KviIrcMessage * msg)
 	if(!msg->haltOutput())
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("End of %c\034!s\034%s\034%c's information"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("End of %c\r!s\r%s\r%c's information"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD);
 	}
 }
 
@@ -1852,7 +1852,7 @@ void KviServerParser::parseNumericTime(KviIrcMessage * msg)
 	{
 		KviWindow * pOut = (KviWindow *)(msg->console());
 		TQString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\034!s\034%s\034%c's time is %Q"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,&szInfo);
+		pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's time is %Q"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,&szInfo);
 	}
 }
 
@@ -1964,7 +1964,7 @@ void KviServerParser::parseNumericCodePageScheme(KviIrcMessage *msg)
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 			TQString szWText = pOut->decodeText(msg->safeTrailing());
 			pOut->output(
-				KVI_OUT_WHOISOTHER,__tr2qs("%c\034!n\034%Q\034%c's codepage is %Q: %Q"),KVI_TEXT_BOLD,
+				KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's codepage is %Q: %Q"),KVI_TEXT_BOLD,
 				&szNick,KVI_TEXT_BOLD,&szCodepage,&szWText);
 		}
 	} else {
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index d29ac9c6..6cd5d944 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -1968,7 +1968,6 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType,
 	// EOF Macros
 
 	int partLen;
-	kvi_wchar_t command_escape;
 
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 
@@ -2021,7 +2020,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType,
 		0                      ,&&found_command_escape ,0                      ,&&found_mirc_escape    ,
 		0                      ,0                      ,0                      ,0                      ,
 		0                      ,0                      ,&&found_mirc_escape    ,0                      ,
-		&&found_command_escape ,0                      ,0                      ,0                      ,
+		0                      ,0                      ,0                      ,0                      ,
 		0                      ,&&found_icon_escape    ,0                      ,&&found_mirc_escape    , // 000-031
 		0                      ,0                      ,0                      ,0                      ,
 		0                      ,0                      ,0                      ,0                      ,
@@ -2183,12 +2182,10 @@ found_end_of_line:
 			p++;
 			return p;
 			break;
-		case '\034': // File Separator (FS), used by translatable command sequences
-		case '\r':   // legacy command escape delimiter
+		case '\r':
 #ifdef COMPILE_USE_DYNAMIC_LABELS
 found_command_escape:
 #endif //COMPILE_USE_DYNAMIC_LABELS
-			command_escape = *p;
 			if (p==pUnEscapeAt) {
 				APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr);
 				NEW_LINE_CHUNK(KVI_TEXT_UNESCAPE);
@@ -2198,44 +2195,40 @@ found_command_escape:
 				break;
 			}
 			// Command escape sequence
-			// <esc_cmd_char> is FS (\034) for the current form:
-			// \034!<escape_cmd>\034<visible parameters string>\034
-			// Legacy form: \r!<escape_cmd>\r<visible parameters string>\r
+			// \r!<escape_cmd>\r<visible parameters string>\r
 			p++;
 			if(*p == '!')
 			{
-				const kvi_wchar_t * next_esc_cmd_char = p;
-				// lookup the next command escape delimiter
-				while(*next_esc_cmd_char && (*next_esc_cmd_char != command_escape))next_esc_cmd_char++;
-				if(*next_esc_cmd_char)
+				const kvi_wchar_t * next_cr = p;
+				// lookup the next carriage return
+				while(*next_cr && (*next_cr != '\r'))next_cr++;
+				if(*next_cr)
 				{
-					const kvi_wchar_t * term_esc_cmd_char = next_esc_cmd_char;
-					term_esc_cmd_char++;
-					while(*term_esc_cmd_char && (*term_esc_cmd_char != command_escape))term_esc_cmd_char++;
-					if(*term_esc_cmd_char)
+					const kvi_wchar_t * term_cr = next_cr;
+					term_cr++;
+					while(*term_cr && (*term_cr != '\r'))term_cr++;
+					if(*term_cr)
 					{
 						// ok....the format is right:
-						//  <esc_cmd_char>! ... <esc_cmd_char> ... <esc_cmd_char>
-						//                ^p    ^next_esc_cmd_char ^term_esc_cmd_char
-						//  Legacy form: \r! ... \r ... \r
+						//  \r!    ... \r ...    \r
+						//    ^p        ^next_cr  ^term_cr
 						p--;
-						//  <esc_cmd_char>! ... <esc_cmd_char> ... <esc_cmd_char>
-						//  ^p                  ^next_esc_cmd_char ^term_esc_cmd_char
-						//  Legacy form: \r! ... \r ... \r
+						//  \r!    ... \r ...    \r
+						//   ^p         ^next_cr  ^term_cr
 						APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
 						NEW_LINE_CHUNK(KVI_TEXT_ESCAPE)
 
-						p+=2; //point after <esc_cmd_char>!
+						p+=2; //point after \r!
 
-						blockLen = (next_esc_cmd_char - p);
-						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc(((next_esc_cmd_char - p) + 1) * sizeof(kvi_wchar_t));
+						blockLen = (next_cr - p);
+						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc(((next_cr - p) + 1) * sizeof(kvi_wchar_t));
 						kvi_fastmoveodd((void *)(line_ptr->pChunks[iCurChunk].szPayload),p,blockLen * sizeof(kvi_wchar_t));
 						
 						line_ptr->pChunks[iCurChunk].szPayload[blockLen] = 0;
 
-						++next_esc_cmd_char; //point after the middle escape command character
+						++next_cr; //point after the middle \r
 						
-						pUnEscapeAt = term_esc_cmd_char;
+						pUnEscapeAt = term_cr;
 						
 						bool bColorSetted=false;
 						if((line_ptr->pChunks[iCurChunk].szPayload[0]=='n') && KVI_OPTION_BOOL(KviOption_boolUseUserListColorsAsNickColors) && (!KVI_OPTION_BOOL(KviOption_boolColorNicks)))
@@ -2244,7 +2237,7 @@ found_command_escape:
 							{
 								if(line_ptr->pChunks[iCurChunk].szPayload[1]=='c' && ((KviChannel*)m_pKviWindow)->userListView())
 								{
-									KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(TQString((TQChar*)next_esc_cmd_char,term_esc_cmd_char-next_esc_cmd_char));
+									KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(TQString((TQChar*)next_cr,term_cr-next_cr));
 									if(e)
 									{
 										line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_CUSTOM; e->color(line_ptr->pChunks[iCurChunk].customFore);
@@ -2254,7 +2247,7 @@ found_command_escape:
 							}
 							else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_QUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c')
 							{
-								TQString m_szNick = TQString((TQChar*)next_esc_cmd_char,term_esc_cmd_char-next_esc_cmd_char);
+								TQString m_szNick = TQString((TQChar*)next_cr,term_cr-next_cr);
 								if(m_szNick==m_pKviWindow->connection()->currentNickName()) {
 									line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_OWN;
 									bColorSetted=true;
@@ -2266,10 +2259,10 @@ found_command_escape:
 							line_ptr->pChunks[iCurChunk].colors.fore=KVI_NOCHANGE;
 						}
 						
-						/*APPEND_LAST_TEXT_BLOCK(next_esc_cmd_char,term_esc_cmd_char - next_esc_cmd_char)
+						/*APPEND_LAST_TEXT_BLOCK(next_cr,term_cr - next_cr)
 						NEW_LINE_CHUNK(KVI_TEXT_UNESCAPE)*/
 
-						p=next_esc_cmd_char;
+						p=next_cr;
 						data_ptr=p;
 					}
 				}
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 945a0a48..bd3651f3 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -313,7 +313,7 @@ void KviQuery::notifyTargetChange(const TQString &oldNick,const TQString &oldUse
 	TQString oldU = oldUser.isEmpty() ? TQString("*") : oldUser;
 	TQString oldH = oldHost.isEmpty() ? TQString("*") : oldHost;
 	output(KVI_OUT_QUERYTRACE,
-		__tr2qs("The target of this query has changed from \034!n\034%Q\034 [%Q@\034!h\034%Q\034] to \034!n\034%Q\034 [%Q@\034!h\034%Q\034]"),
+		__tr2qs("The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
 		&oldN,&oldU,&oldH,&nick,&user,&host);
 	updateLabelText();
 }
@@ -382,10 +382,10 @@ void KviQuery::notifyCommonChannels(const TQString &nick,const TQString &user,co
 	static TQString star("*");
 	if(iChans > 0)
 	{
-		output(KVI_OUT_QUERYTRACE,__tr2qs("Common channels for \034!n\034%Q\034 [%Q@\034!h\034%Q\034]: %Q"),
+		output(KVI_OUT_QUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 			&nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host,&szChans);
 	} else {
-		output(KVI_OUT_QUERYTRACE,__tr2qs("No common channels for \034!n\034%Q\034 [%Q@\034!h\034%Q\034]"),
+		output(KVI_OUT_QUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
 			&nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host);
 	}
 	updateLabelText();
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 1948cab6..a2d44b76 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -628,7 +628,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
 
 		if(_OUTPUT_VERBOSE)
 		{
-			dcc->console()->output(KVI_OUT_DCCMSG,__tr2qs_ctx("Auto-saving DCC %Q file %Q as \034![!dbl]play $0\034%Q\034","dcc"),
+			dcc->console()->output(KVI_OUT_DCCMSG,__tr2qs_ctx("Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r","dcc"),
 				&(dcc->szType),&(dcc->szFileName),&(dcc->szLocalFileName));
 		}
 
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 582d2caa..a3ab1945 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -693,7 +693,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		if(bSSLExtension)szSwitches.prepend("-s ");
 #endif
 		dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
-			__tr2qs_ctx("Use %c\034![!dbl]dcc.send %s -i=%s -p=%s %Q\034/dcc.send %s -i=%s -p=%s %Q\034%c to send the file (or double-click on the socket)","dcc"),
+			__tr2qs_ctx("Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c to send the file (or double-click on the socket)","dcc"),
 			KVI_TEXT_BOLD,
 			szSwitches.ptr(),
 			dcc->szParam2.ptr(),dcc->szParam3.ptr(),&(dcc->ctcpMsg->pSource->nick()),
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 629f8542..d8522b97 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1625,7 +1625,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
 					KviConsole *c;
 					if(!g_pApp->windowExists(m_pDescriptor->console())) c=g_pApp->activeConsole();
 					else c=m_pDescriptor->console();
-					c->output(KVI_OUT_DCCMSG,__tr2qs_ctx("DCC %s transfer with %Q@%Q:%Q completed: \034![!dbl]play $0\034%s\034","dcc"),
+					c->output(KVI_OUT_DCCMSG,__tr2qs_ctx("DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r","dcc"),
 						m_pDescriptor->bIsTdcc ? (m_pDescriptor->bRecvFile ? "TRECV" : "TSEND") : (m_pDescriptor->bRecvFile ? "RECV" : "SEND"),
 						&(m_pDescriptor->szNick),&(m_pDescriptor->szIp),&(m_pDescriptor->szPort),
 						&(m_pDescriptor->szLocalFileName));
diff --git a/translations/messages/kvirc-dcc/ca.po b/translations/messages/kvirc-dcc/ca.po
index 7ca5bc65..af96c3eb 100644
--- a/translations/messages/kvirc-dcc/ca.po
+++ b/translations/messages/kvirc-dcc/ca.po
@@ -146,9 +146,9 @@ msgstr "Esculli els Arxius a Enviar - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
 #, fuzzy
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
-"Guardant automàticament el DCC %s arxiu %s com a ![!dbl]play $0%s"
+"Guardant automàticament el DCC %s arxiu %s com a \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/broker.cpp:665
 #, fuzzy
@@ -635,10 +635,10 @@ msgstr "El client remot està escoltant en la interfície %s i port %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Emprar %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q"
+"Emprar %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r"
 "%c per a enviar l'arxiu (o doble click al socket)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -864,8 +864,8 @@ msgstr "[ERROR SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
 #, fuzzy
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "Transferència DCC %s amb %s@%s:%s completada: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "Transferència DCC %s amb %s@%s:%s completada: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/cs.po b/translations/messages/kvirc-dcc/cs.po
index 4a1e5039..bb5aa638 100644
--- a/translations/messages/kvirc-dcc/cs.po
+++ b/translations/messages/kvirc-dcc/cs.po
@@ -133,8 +133,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Vyberte soubory k uložení - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Automatické ukládání DCC %Q souboru %Q jako ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Automatické ukládání DCC %Q souboru %Q jako \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -599,10 +599,10 @@ msgstr "Vzdálený klient naslouchá na rozhraní %s a portu %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Použijte %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q"
+"Použijte %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r"
 "%c k poslání souboru (nebo dvojklikem na soket)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -822,8 +822,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[SSL CHYBA]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "DCC %s přenos s %Q@%Q:%Q kompletní: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "DCC %s přenos s %Q@%Q:%Q kompletní: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/de.po b/translations/messages/kvirc-dcc/de.po
index c57f296b..291a0f6f 100644
--- a/translations/messages/kvirc-dcc/de.po
+++ b/translations/messages/kvirc-dcc/de.po
@@ -143,8 +143,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Dateien zum Speichern auswählen - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Automatisches Speichern der DCC-%Q-Datei %Q als ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Automatisches Speichern der DCC-%Q-Datei %Q als \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -617,10 +617,10 @@ msgstr "Der entfernte Client wartet an Schnittstelle %s und Port %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"%c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c zum "
+"%c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c zum "
 "Senden der Datei benutzen (oder doppelt auf den Socket klicken)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -850,9 +850,9 @@ msgid "[SSL ERROR]: %1"
 msgstr "[SSL-FEHLER]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
 msgstr ""
-"DCC %s-Übertragung mit %Q@%Q:%Q abgeschlossen: ![!dbl]spiele $0%s"
+"DCC %s-Übertragung mit %Q@%Q:%Q abgeschlossen: \r![!dbl]spiele $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/es.po b/translations/messages/kvirc-dcc/es.po
index 6cdfdd82..bcf9fce2 100644
--- a/translations/messages/kvirc-dcc/es.po
+++ b/translations/messages/kvirc-dcc/es.po
@@ -144,9 +144,9 @@ msgstr "Escoja los Archivos a Enviar - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
 #, fuzzy
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
-"Guardando automáticamente el DCC %s archivo %s como ![!dbl]play $0%s"
+"Guardando automáticamente el DCC %s archivo %s como \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/broker.cpp:665
 #, fuzzy
@@ -633,10 +633,10 @@ msgstr "El cliente remoto está escuchando en el interfaz %s y puerto %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Usar %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Usar %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "para enviar el archivo (o doble click en el socket)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -867,8 +867,8 @@ msgstr "[ERROR SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
 #, fuzzy
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "Transferencia DCC %s con %s@%s:%s completada: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "Transferencia DCC %s con %s@%s:%s completada: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/es_AR.po b/translations/messages/kvirc-dcc/es_AR.po
index 58362579..645f1759 100644
--- a/translations/messages/kvirc-dcc/es_AR.po
+++ b/translations/messages/kvirc-dcc/es_AR.po
@@ -112,7 +112,7 @@ msgid "Choose Files to Save - KVIrc"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:665
@@ -536,7 +536,7 @@ msgstr ""
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
 
@@ -736,7 +736,7 @@ msgid "[SSL ERROR]: %1"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1643
diff --git a/translations/messages/kvirc-dcc/fi.po b/translations/messages/kvirc-dcc/fi.po
index 7047d05f..4aa4af0b 100644
--- a/translations/messages/kvirc-dcc/fi.po
+++ b/translations/messages/kvirc-dcc/fi.po
@@ -115,7 +115,7 @@ msgid "Choose Files to Save - KVIrc"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:665
@@ -539,7 +539,7 @@ msgstr ""
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
 
@@ -739,7 +739,7 @@ msgid "[SSL ERROR]: %1"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1643
diff --git a/translations/messages/kvirc-dcc/fr.po b/translations/messages/kvirc-dcc/fr.po
index 47a7fa68..d267ef09 100644
--- a/translations/messages/kvirc-dcc/fr.po
+++ b/translations/messages/kvirc-dcc/fr.po
@@ -141,9 +141,9 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Choisir Fichiers à Enregistrer - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
-"Sauvegarde automatique le fichier de DCC %Q %Q en ![!dbl]play $0%Q"
+"Sauvegarde automatique le fichier de DCC %Q %Q en \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -620,10 +620,10 @@ msgstr "Le client distant écoute sur l'interface %s et le port %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Utilisez %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q"
+"Utilisez %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r"
 "%c pour envoyer le fichier (ou double-cliquez sur le lien)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -846,8 +846,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[ERREUR SSL] : %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "Le transfert DCC %s avec %Q@%Q:%Q est terminé : ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "Le transfert DCC %s avec %Q@%Q:%Q est terminé : \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/hu.po b/translations/messages/kvirc-dcc/hu.po
index 13d4fe25..326da13a 100644
--- a/translations/messages/kvirc-dcc/hu.po
+++ b/translations/messages/kvirc-dcc/hu.po
@@ -134,8 +134,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Fájlnév megadása mentéshez - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Automatikus DCC mentés: Fájl: %Q %Q mint: ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Automatikus DCC mentés: Fájl: %Q %Q mint: \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -595,10 +595,10 @@ msgstr "A távoli kliens hallgatózik %s eszközön, %s porton keresztül"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Használd %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q"
+"Használd %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r"
 "%c fájlküldéshez (vagy duplka katt a Socketen)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -819,8 +819,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[SSL HIBA]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "DCC %s adatátvitel %Q@%Q:%Q felől, kész: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "DCC %s adatátvitel %Q@%Q:%Q felől, kész: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/it.po b/translations/messages/kvirc-dcc/it.po
index a691ae4e..5689510f 100644
--- a/translations/messages/kvirc-dcc/it.po
+++ b/translations/messages/kvirc-dcc/it.po
@@ -147,8 +147,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Scegli i Files da Salvare - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Salvo automaticamente il file DCC %Q come ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Salvo automaticamente il file DCC %Q come \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -619,10 +619,10 @@ msgstr "Il client remoto è in ascolto sull'interfaccia %s e porta %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Usa %c [!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Usa %c\r [!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "per inviare il file (o doppio click sul link)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -844,8 +844,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[ERRORE SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "Trasferimento DCC %s con %Q@%Q:%Q completato: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "Trasferimento DCC %s con %Q@%Q:%Q completato: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/kvirc-dcc.pot b/translations/messages/kvirc-dcc/kvirc-dcc.pot
index 846da7ca..35744e54 100644
--- a/translations/messages/kvirc-dcc/kvirc-dcc.pot
+++ b/translations/messages/kvirc-dcc/kvirc-dcc.pot
@@ -116,7 +116,7 @@ msgid "Choose Files to Save - KVIrc"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:665
@@ -540,7 +540,7 @@ msgstr ""
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
 
@@ -740,7 +740,7 @@ msgid "[SSL ERROR]: %1"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1643
diff --git a/translations/messages/kvirc-dcc/pt.po b/translations/messages/kvirc-dcc/pt.po
index e5ad55b1..d39e0e7f 100644
--- a/translations/messages/kvirc-dcc/pt.po
+++ b/translations/messages/kvirc-dcc/pt.po
@@ -147,8 +147,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Escolher Ficheiros para Gravar - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Auto-guardar DCC %Q ficheiro %Q como ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Auto-guardar DCC %Q ficheiro %Q como \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -613,10 +613,10 @@ msgstr "O cliente remoto está a escutar no interface %s e porta %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Usar %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Usar %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "para enviar o ficheiro (ou duplo clique no socket)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -836,8 +836,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[ERRO SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "Transferência DCC %s com %Q@%Q:%Q completa: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "Transferência DCC %s com %Q@%Q:%Q completa: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/pt_BR.po b/translations/messages/kvirc-dcc/pt_BR.po
index 089a56ea..f16ae581 100644
--- a/translations/messages/kvirc-dcc/pt_BR.po
+++ b/translations/messages/kvirc-dcc/pt_BR.po
@@ -141,7 +141,7 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Escolha os arquivos para salvar - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
 msgstr ""
 
 #: src/modules/dcc/broker.cpp:665
@@ -609,10 +609,10 @@ msgstr "O cliente remoto está escutando na interface %s e porta %s"
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "para enviar o arquivo (ou clique duas vezes no socket)"
 
 #: src/modules/dcc/requests.cpp:728
@@ -835,7 +835,7 @@ msgid "[SSL ERROR]: %1"
 msgstr "[ERRO SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
 msgstr ""
 
 #: src/modules/dcc/send.cpp:1643
diff --git a/translations/messages/kvirc-dcc/ru.po b/translations/messages/kvirc-dcc/ru.po
index a2cc2529..c24324bc 100644
--- a/translations/messages/kvirc-dcc/ru.po
+++ b/translations/messages/kvirc-dcc/ru.po
@@ -139,8 +139,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Выберите файл для сохранения — KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Автосохранение DCC %Q файла %Q как ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Автосохранение DCC %Q файла %Q как \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 msgid ""
@@ -601,11 +601,11 @@ msgstr "Удалённый клиент прослушивает интерфе
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Используется %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s "
-"%Q%c для отправки файла (или двойной клик на сокете)"
+"Используется %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s "
+"%Q\r%c для отправки файла (или двойной клик на сокете)"
 
 #: src/modules/dcc/requests.cpp:728
 msgid ""
@@ -824,8 +824,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[ОШИБКА SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "DCC %s передача с %Q@%Q:%Q завершена: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "DCC %s передача с %Q@%Q:%Q завершена: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc-dcc/uk.po b/translations/messages/kvirc-dcc/uk.po
index 61cea706..c110fb36 100644
--- a/translations/messages/kvirc-dcc/uk.po
+++ b/translations/messages/kvirc-dcc/uk.po
@@ -142,8 +142,8 @@ msgid "Choose Files to Save - KVIrc"
 msgstr "Виберіть файл для передачі - KVIrc"
 
 #: src/modules/dcc/broker.cpp:631
-msgid "Auto-saving DCC %Q file %Q as ![!dbl]play $0%Q"
-msgstr "Автозбереження DCC %Q файлу %Q як ![!dbl]play $0%Q"
+msgid "Auto-saving DCC %Q file %Q as \r![!dbl]play $0\r%Q\r"
+msgstr "Автозбереження DCC %Q файлу %Q як \r![!dbl]play $0\r%Q\r"
 
 #: src/modules/dcc/broker.cpp:665
 #, fuzzy
@@ -600,11 +600,11 @@ msgstr "Вилучений клієнт прослуховує інтерфей
 
 #: src/modules/dcc/requests.cpp:696
 msgid ""
-"Use %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p=%s %Q%c "
+"Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c "
 "to send the file (or double-click on the socket)"
 msgstr ""
-"Використається %c![!dbl]dcc.send %s -i=%s -p=%s %Q/dcc.send %s -i=%s -p="
-"%s  %Q%c для відправлення файлу (або подвійний клич на сокете)"
+"Використається %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p="
+"%s  %Q\r%c для відправлення файлу (або подвійний клич на сокете)"
 
 #: src/modules/dcc/requests.cpp:728
 msgid ""
@@ -820,8 +820,8 @@ msgid "[SSL ERROR]: %1"
 msgstr "[ПОМИЛКА SSL]: %1"
 
 #: src/modules/dcc/send.cpp:1628
-msgid "DCC %s transfer with %Q@%Q:%Q completed: ![!dbl]play $0%s"
-msgstr "DCC %s передача з %Q@%Q:%Q завершена: ![!dbl]play $0%s"
+msgid "DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r"
+msgstr "DCC %s передача з %Q@%Q:%Q завершена: \r![!dbl]play $0\r%s\r"
 
 #: src/modules/dcc/send.cpp:1643
 msgid "Transfer completed"
diff --git a/translations/messages/kvirc/bg.po b/translations/messages/kvirc/bg.po
index a9f1ae93..b4949ddc 100644
--- a/translations/messages/kvirc/bg.po
+++ b/translations/messages/kvirc/bg.po
@@ -2591,7 +2591,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -2604,7 +2604,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
 
@@ -2636,7 +2636,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
 
@@ -2678,7 +2678,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -2698,7 +2698,7 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2706,7 +2706,7 @@ msgid "watch"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -5008,12 +5008,12 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -5026,7 +5026,7 @@ msgid "Channel CTCP"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -5035,7 +5035,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
 
@@ -5052,7 +5052,7 @@ msgid "replied"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5067,7 +5067,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5075,7 +5075,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5136,11 +5136,11 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5153,12 +5153,12 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
@@ -5175,15 +5175,15 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5191,27 +5191,27 @@ msgid "Received a part message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
@@ -5221,7 +5221,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
@@ -5230,23 +5230,23 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
@@ -5256,20 +5256,20 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5286,7 +5286,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5294,24 +5294,24 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5320,7 +5320,7 @@ msgid "End of merged output"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5332,7 +5332,7 @@ msgid "double-click the channel name to join"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
@@ -5340,7 +5340,7 @@ msgid "Received an invite message directed to another nick, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
@@ -5353,7 +5353,7 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
@@ -5361,7 +5361,7 @@ msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
@@ -5369,16 +5369,16 @@ msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
@@ -5435,11 +5435,11 @@ msgid "This server supports: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -5451,7 +5451,7 @@ msgid "Channel topic is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -5459,7 +5459,7 @@ msgid "No channel topic is set"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -5471,19 +5471,19 @@ msgid "Topic was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -5493,7 +5493,7 @@ msgid "(Unknown)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5509,7 +5509,7 @@ msgid "ban exception list"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
@@ -5526,8 +5526,8 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
 
@@ -5548,7 +5548,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5568,27 +5568,27 @@ msgid "End of help about %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -5596,31 +5596,31 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -5632,7 +5632,7 @@ msgid "Channel was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -5681,36 +5681,36 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -5743,7 +5743,7 @@ msgid "Your encoding is now %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -6960,16 +6960,16 @@ msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:424
diff --git a/translations/messages/kvirc/ca.po b/translations/messages/kvirc/ca.po
index d19b2fd4..86543fd7 100644
--- a/translations/messages/kvirc/ca.po
+++ b/translations/messages/kvirc/ca.po
@@ -2712,12 +2712,12 @@ msgstr "ha canviat la m�cara de registre o el nick est�fent-se servir per al
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Llista de notificaci� Sembla que !n%Q est�conectat, per�la m�cara [%Q@"
-"!h%Q] no concorda (alg est�fent servir el seu nick o la m�cara que ha "
+"Llista de notificaci� Sembla que \r!n\r%Q\r est�conectat, per�la m�cara [%Q@"
+"\r!h\r%Q\r] no concorda (alg est�fent servir el seu nick o la m�cara que ha "
 "posat no concorda)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2730,10 +2730,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Llista de notificaci� inconsist�cia inesperada, esperava tindre a !n%Q "
+"Llista de notificaci� inconsist�cia inesperada, esperava tindre a \r!n\r%Q\r "
 "a la BD d'usuaris registrats..."
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2772,10 +2772,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Llista de notificaci� Sembla ser que !n%Q s'ha desconectat mentre "
+"Llista de notificaci� Sembla ser que \r!n\r%Q\r s'ha desconectat mentre "
 "esperava la seva resposta USERHOST, es recomprovar�en el pr�im cicle"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2820,12 +2820,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Llista de notificaci�: !n%Q sembla estar conectat, per�la m�cara [%Q@"
-"!h%Q] no concorda (watch: alg m� est�fent servir el seu nick o la seva "
+"Llista de notificaci�: \r!n\r%Q\r sembla estar conectat, per�la m�cara [%Q@"
+"\r!h\r%Q\r] no concorda (watch: alg m� est�fent servir el seu nick o la seva "
 "m�cara de registre no concorda)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2845,16 +2845,16 @@ msgid "removed from watch list"
 msgstr "eliminada de la llista de vigil�cia"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Llista de notificaci� aturant el seguiment per a: !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Llista de notificaci� aturant el seguiment per a: \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "vigil�cia"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Llista de notificaci� !n%Q  est�desconnectada (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Llista de notificaci� \r!n\r%Q\r  est�desconnectada (watch)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5356,13 +5356,13 @@ msgstr "Descarregant el m�ul '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, fuzzy, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Ignorant PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorant PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, fuzzy, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Ignorant PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorant PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5375,7 +5375,7 @@ msgstr "CTCP de canal"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
 #, fuzzy
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "%Q %S resposta de %Q [%Q@%Q]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -5385,7 +5385,7 @@ msgstr "La segent petici�CTCP t�un dest�no reconegut %Q"
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 #, fuzzy
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr "Petici�%Q %S de %Q [%Q@%Q] (%Q), ignorada (l�it de saturaci�excedit)"
 
@@ -5403,7 +5403,7 @@ msgstr "resposta"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
 #, fuzzy
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr "petici�%Q %S de %Q [%Q@%Q] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5420,7 +5420,7 @@ msgstr ""
 "confii en el temps mostrat"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr "Resposta PING %Q de %Q [%Q@%Q]: %u segs %u msegs"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5428,7 +5428,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "El segent CTCP ACTION t�un dest�no reconegut %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "CTCP ACTION de %Q [%Q@%Q]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5501,14 +5501,14 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
 #, fuzzy
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr "Ignorant la petici�DCC %S de %Q [%Q@%Q] (%S %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
 #, fuzzy
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
-"Processant petici�DCC %Q solicitada des de !n%Q [%Q@!h%Q] (%Q %s)"
+"Processant petici�DCC %Q solicitada des de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5522,13 +5522,13 @@ msgstr "Incapa�de processar la petici�anterior: el m�ul DCC pot estar tren
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
 #, fuzzy
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Ping rebut de !s%s (PING %s), respost pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Ping rebut de \r!s\r%s\r (PING %s), respost pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Rebut pong de !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Rebut pong de \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 #, fuzzy
@@ -5546,50 +5546,50 @@ msgstr "Rebut un missatge JOIN d'un canal desconegut, possible desync?"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 #, fuzzy
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] s'ha unit a !c%Q [canvi de mode-u impl�it +"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] s'ha unit a \r!c\r%Q\r [canvi de mode-u impl�it +"
 "%c]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] s'ha unit a !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] s'ha unit a \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] s'acaba d'unir a !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] s'acaba d'unir a \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
 msgstr "Rebut un missatge PART d'un canal desconegut, possible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Has abandonat el canal !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Has abandonat el canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Has abandonat el canal !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Has abandonat el canal \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] ha abandonat !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha abandonat \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] ha abandonat !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha abandonat \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] s'acaba de marxar !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] s'acaba de marxar \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] s'acaba de marxar !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] s'acaba de marxar \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5598,8 +5598,8 @@ msgstr "Netsplit detectat: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] s'ha marxat de l'IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] s'ha marxat de l'IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5607,28 +5607,28 @@ msgstr "Rebut un missatge d'expulsi�d'un canal desconegut, possible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Has estat expulsat de !c%Q por !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Has estat expulsat de \r!c\r%Q\r por \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Intentant tornar a entrar !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Intentant tornar a entrar \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] ha sigut expulsat de !c%Q per !n%Q "
-"[%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha sigut expulsat de \r!c\r%Q\r per \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] acaba de ser expulsat de !c%Q per !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] acaba de ser expulsat de \r!c\r%Q\r per \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 #, fuzzy
@@ -5641,25 +5641,25 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
 #, fuzzy
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorant PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorant PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"PRIVMSG spam de !n%Q [%Q@!h%Q]: %Q (paraula-spam coincident \"%s"
+"PRIVMSG spam de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (paraula-spam coincident \"%s"
 "\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
 #, fuzzy
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorant PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorant PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
 #, fuzzy
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorant PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorant PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5677,9 +5677,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Not�ia spam de !n%Q [%Q@!h%Q]: %Q (paraula-spam coincident \"%Q"
+"Not�ia spam de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (paraula-spam coincident \"%Q"
 "\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5687,30 +5687,30 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr "Rebut un missatge de tema d'un canal desconegut, posible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] ha canviat el tema a \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha canviat el tema a \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] es coneix ara com a !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] es coneix ara com a \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"El dest�d'aquest privat s'ha perdut i ha estat trobat quan !n%Q [%Q@!"
-"h%Q] ha canviat el seu nick a !n%Q"
+"El dest�d'aquest privat s'ha perdut i ha estat trobat quan \r!n\r%Q\r [%Q@\r!"
+"h\r%Q\r] ha canviat el seu nick a \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 #, fuzzy
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"El canvi recent de nick des de !n%Q a !n%Q ha causat una "
+"El canvi recent de nick des de \r!n\r%Q\r a \r!n\r%Q\r ha causat una "
 "colisi�de privats: barrejant la sortida"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5719,8 +5719,8 @@ msgstr "Final de sortida barrejada"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
 #, fuzzy
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Ignorant PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ignorant PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5731,16 +5731,16 @@ msgid "double-click the channel name to join"
 msgstr "premi dues vegades en el nom del canal per entrar"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] t'invita al canal !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] t'invita al canal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
 msgstr "Rebut un missatge INVITE dirigit a un altre nick, possible desync"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS de !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5752,33 +5752,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Rebut un canvi de mode d'un canal desconegut, possible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] ha canviat la clau del canal a \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] ha canviat la clau del canal a \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] ha tret la clau del canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] ha posat el l�it del canal !m-la %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] ha posat el l�it del canal \r!m-l\ra %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] ha tret el l�it del canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] ha posat el mode %ce !m%ce%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] ha posat el mode %ce \r!m%ce\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] ha posat el mode del canal !m%c%ca %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] ha posat el mode del canal \r!m%c%c\ra %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] ha posat el mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] ha posat el mode %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5843,12 +5843,12 @@ msgid "This server supports: %s"
 msgstr "El servidor suporta: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Fi de NAMES per a !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Fi de NAMES per a \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Noms per a !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Noms per a \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5859,16 +5859,16 @@ msgid "Channel topic is: %Q"
 msgstr "El tema del canal �: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "El tema per a !c%Q �: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "El tema per a \r!c\r%Q\r �: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "No s'ha posat tema de canal"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "No s'ha posat tema per al canal !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "No s'ha posat tema per al canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 #, fuzzy
@@ -5882,22 +5882,22 @@ msgstr "El tema va ser posat per \r!n\r%Q\r!%Q@\r!h\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr ""
-"El tema per a !c%Q va ser posat per !n%Q!%Q@!h%Q el %Q"
+"El tema per a \r!c\r%Q\r va ser posat per \r!n\r%Q\r!%Q@\r!h\r%Q\r el %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q"
-msgstr "El tema per a !c%Q �: %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "El tema per a \r!c\r%Q\r �: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "El mode de canal per a !c%Q � %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "El mode de canal per a \r!c\r%Q\r � %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Mode d'usuari per a !n%Q � %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Mode d'usuari per a \r!n\r%Q\r � %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5906,8 +5906,8 @@ msgid "(Unknown)"
 msgstr "(Desconegut)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Fi del canal %Q per a !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Fi del canal %Q per a \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5922,8 +5922,8 @@ msgid "ban exception list"
 msgstr "llista d'excepcions a prohibicions"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q per a !c%Q: !m-%c%Q (posat per %Q el %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q per a \r!c\r%Q\r: \r!m-%c\r%Q\r (posat per %Q el %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5939,12 +5939,12 @@ msgstr "Llistat d'excepcions a prohibicions"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Entrada WHO per a %c!n%Q%c [%Q@!h%Q]: %cCanal%c: !c%Q, "
-"%cServidor%c: !s%Q, %cSalts%c: %d, %cFlags%c: %Q, %cAusents%c: %Q, "
+"Entrada WHO per a %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cCanal%c: \r!c\r%Q\r, "
+"%cServidor%c: \r!s\r%Q\r, %cSalts%c: %d, %cFlags%c: %Q, %cAusents%c: %Q, "
 "%cNom real%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5968,9 +5968,9 @@ msgstr ""
 "el nick de forma manual"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
-"No hi ha forma d'autentificar-se com a '!n%Q' (%d: %Q), intentant "
+"No hi ha forma d'autentificar-se com a '\r!n\r%Q\r' (%d: %Q), intentant "
 "'%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5993,61 +5993,61 @@ msgid "End of help about %Q"
 msgstr "Fi de llista WHO per a %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c est�aussent: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c est�aussent: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c � %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c � %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c nom real: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c nom real: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c era %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c era %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "El nom real de %c!n%Q%c era: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "El nom real de %c\r!n\r%Q\r%c era: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "El canals de %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "El canals de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr "Rebut un RPL_WHOISIDLE erroni, no puc calcular el temps d'espera"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "Temps d'espera de %c!n%Q%c : %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "Temps d'espera de %c\r!n\r%Q\r%c : %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "Temps d'entrada de %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "Temps d'entrada de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "Servidor de %c!n%Q%c: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "Servidor de %c\r!n\r%Q\r%c: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
 #, fuzzy
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "El nom real de %c!n%Q%c era: %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "El nom real de %c\r!n\r%Q\r%c era: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "Informaci�de %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "Informaci�de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c info WHOIS de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c info WHOIS de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c info WHOWAS de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c info WHOWAS de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -6058,8 +6058,8 @@ msgid "Channel was created at %Q"
 msgstr "El canal va ser creat el %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "El canal !c%Q va ser creat el %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "El canal \r!c\r%Q\r va ser creat el %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6107,39 +6107,39 @@ msgstr "Posant el nick en mode aussent (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, fuzzy, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "Informaci�de %c!n%Q%c: %Q"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "Informaci�de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, fuzzy, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "Informaci�de %c!n%Q%c: %Q"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "Informaci�de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, fuzzy, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "El canals de %c!n%Q%c: %Q"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "El canals de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
 #, fuzzy
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q [%Q@!h%Q] t'invita al canal !c%Q (%Q)"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] t'invita al canal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, fuzzy, c-format
-msgid "%c!s%s%c's information:"
-msgstr "Informaci�de %c!n%Q%c: %Q"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "Informaci�de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
 #, fuzzy
-msgid "%c!s%s%c's time is %Q"
-msgstr "Informaci�de %c!n%Q%c: %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "Informaci�de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6176,8 +6176,8 @@ msgstr "La teva codificaci�� ara %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
 #, fuzzy
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "El canals de %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "El canals de %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7438,19 +7438,19 @@ msgstr "Unir-se a Canals"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"El dest�d'aquest privat ha canviat de !n%Q [%Q@!h%Q] a !n%Q"
-" [%Q@!h%Q]"
+"El dest�d'aquest privat ha canviat de \r!n\r%Q\r [%Q@\r!h\r%Q\r] a \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Canals comuns per a !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Canals comuns per a \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "No hi ha canals comuns per a !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "No hi ha canals comuns per a \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/cs.po b/translations/messages/kvirc/cs.po
index 2f1e5ab9..287358ab 100644
--- a/translations/messages/kvirc/cs.po
+++ b/translations/messages/kvirc/cs.po
@@ -2621,11 +2621,11 @@ msgstr "registrační maska změněna, nebo přezdívku používá ještě někd
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Seznam Oznamování:: !n%Q vypadá jako online, ale maska [%Q@!h%Q] "
+"Seznam Oznamování:: \r!n\r%Q\r vypadá jako online, ale maska [%Q@\r!h\r%Q\r] "
 "nesouhlasí (registrační maska nesouhlasí, nebo přezdívku používá ještě někdo "
 "jiný)"
 
@@ -2639,10 +2639,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Seznam Oznamování: Neočekávaná nekonzistence, očekáván !n%Q v databázi "
+"Seznam Oznamování: Neočekávaná nekonzistence, očekáván \r!n\r%Q\r v databázi "
 "registrovaných uživatelů"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2678,10 +2678,10 @@ msgstr "Seznam Oznamování: Poškozená USERHOST odezva od serveru? (%s)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Seznam Oznamovánít: !n%Q vypadá jako offline ještě před obdrženou "
+"Seznam Oznamovánít: \r!n\r%Q\r vypadá jako offline ještě před obdrženou "
 "USERHOST odezvou, zkusíme zkontrolovat v další smyčce"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2724,12 +2724,12 @@ msgstr "registrační maska změněna nebo desynchronizace s watch službou"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Seznam Oznamování: !n%Q vypadá, že je online, ale maska [%Q@!h%Q"
-"] nesouhlasí (watch: registrační maska nesouhlasí, nebo přezdívku používá "
+"Seznam Oznamování: \r!n\r%Q\r vypadá, že je online, ale maska [%Q@\r!h\r%Q"
+"\r] nesouhlasí (watch: registrační maska nesouhlasí, nebo přezdívku používá "
 "ještě někdo jiný)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2749,16 +2749,16 @@ msgid "removed from watch list"
 msgstr "odebrán z watch seznamu"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Seznam Oznamování: Zastaven watch pro !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Seznam Oznamování: Zastaven watch pro \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Seznam oznamování: !n%Q je offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Seznam oznamování: \r!n\r%Q\r je offline (watch)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5145,13 +5145,13 @@ msgstr "Smazán modul '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Ignoruje se DCC od !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignoruje se DCC od \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Ignoruje se CTCP od !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignoruje se CTCP od \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5163,8 +5163,8 @@ msgid "Channel CTCP"
 msgstr "Kanálové CTCP"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q odezva od !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q odezva od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5172,10 +5172,10 @@ msgstr "Následující CTCP požadavek má neočekávaný cíl %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c požadavek od !n%Q [%Q@!h%Q] (%Q), ignorován (překročen "
+"%Q %Q%c požadavek od \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignorován (překročen "
 "limit zahlcení)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5191,8 +5191,8 @@ msgid "replied"
 msgstr "odpovězeno"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c požadavek od !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c požadavek od \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5208,7 +5208,7 @@ msgstr ""
 "zobrazenému času"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr "%Q PING odezva od %Q [%Q@%Q]: %u sek %u msek"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5216,7 +5216,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "Následující CTCP ACTION má neočekávaný cíl %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "CTCP ACTION od %Q [%Q@%Q]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5280,12 +5280,12 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ": Žádná taková přezdívka v databázi, ignoruji změnu"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Ignoruje se DCC %S požadavek od !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Ignoruje se DCC %S požadavek od \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "Zpracovává se DCC %Q požadavek od !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "Zpracovává se DCC %Q požadavek od \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5297,13 +5297,13 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr "Nelze zpracovat předchozí požadavek: DCC modul je možná poškozen"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Obdržen ping od !s%Q (PING %Q), odezva pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Obdržen ping od \r!s\r%Q\r (PING %Q), odezva pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Obdržen pong od !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Obdržen pong od \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5319,45 +5319,45 @@ msgstr "Obdržena join zpráva z neznámého kanálu, možná desychronizace"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] přišel do !c%Q [implicit +%c umode změna]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] přišel do \r!c\r%Q\r [implicit +%c umode změna]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] přišel do !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] přišel do \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] zrovna přišel do !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] zrovna přišel do \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
 msgstr "Obdržena part zpráva z neznámého kanálu, možná desynchronizace"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Odešel jste z kanálu !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Odešel jste z kanálu \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Odešel jste z kanálu !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Odešel jste z kanálu \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] odešel z !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] odešel z \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] odešel z !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] odešel z \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] zrovna odešel z !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] zrovna odešel z \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] rovna odešel z !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] rovna odešel z \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5366,8 +5366,8 @@ msgstr "Detekován Netsplit: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] opustil IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] opustil IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5375,29 +5375,29 @@ msgstr "Obdržena vykopávací zpráva z neznámého kanálu, možná desynchron
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Byl jste vykopnut z !c%Q a udělal to !n%Q [%Q@!h%Q]: %Q"
+"Byl jste vykopnut z \r!c\r%Q\r a udělal to \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Zkouší se znovu přijít do !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Zkouší se znovu přijít do \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] byl vykopnut z !c%Q a udělal to !n%Q "
-"[%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] byl vykopnut z \r!c\r%Q\r a udělal to \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] byl zrovna vykopnut z !c%Q a udělal to !n"
-"%Q [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] byl zrovna vykopnut z \r!c\r%Q\r a udělal to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5408,23 +5408,23 @@ msgstr ""
 "jejím dekódování: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignoruje se query-PRIVMSG od !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignoruje se query-PRIVMSG od \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Spamová soukromá zpráva od !n%Q [%Q@!h%Q]: %Q (obsahují "
+"Spamová soukromá zpráva od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (obsahují "
 "spamslovo \"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignoruje se kanál-PRIVMSG od !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignoruje se kanál-PRIVMSG od \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignoruje se Oznámení od !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignoruje se Oznámení od \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5442,38 +5442,38 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Spam oznámení od !n%Q [%Q@!h%Q]: %Q (obsahuje spamslovo \"%Q\")"
+"Spam oznámení od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (obsahuje spamslovo \"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
 msgid "Received a topic message for an unknown channel, possible desync"
 msgstr "Obdržena zpráva o tématu z neznámého kanálu, možná desynchronizace"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] změnil téma na \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] změnil téma na \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] je nyní znám jako !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je nyní znám jako \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Cíl tohoto query se ztratil a byl nalezen když !n%Q [%Q@!h%Q] "
-"změnil svou přezdívku na !n%Q"
+"Cíl tohoto query se ztratil a byl nalezen když \r!n\r%Q\r [%Q@\r!h\r%Q\r] "
+"změnil svou přezdívku na \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Poslední změna přezdívky z !n%Q na !n%Q způsobila query kolizi: "
+"Poslední změna přezdívky z \r!n\r%Q\r na \r!n\r%Q\r způsobila query kolizi: "
 "spojuji výstup"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5481,8 +5481,8 @@ msgid "End of merged output"
 msgstr "Konec spojeného výstupu"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Ignoruje se pozvání od !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ignoruje se pozvání od \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5493,16 +5493,16 @@ msgid "double-click the channel name to join"
 msgstr "dvojklikni na názvu kanálu pro příchod"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] tě zve do kanálu !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] tě zve do kanálu \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
 msgstr "Obdržena pozývací zpráva pro jinou přezdívku, možná desynchronizace"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS od !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5514,33 +5514,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Obdržena změna módu pro neznámý kanál, možná desynchronizace"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] nastavil klíč kanálu na \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] nastavil klíč kanálu na \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] zrušil klíč kanálu"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] nastavil kanálu !m-llimit na %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] nastavil kanálu \r!m-l\rlimit na %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] zrušil limit kanálu"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] nastavil mód %ce !m%ce%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] nastavil mód %ce \r!m%ce\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] nastavil kanálu !m%c%cmód %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] nastavil kanálu \r!m%c%c\rmód %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] nastavil mód %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] nastavil mód %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5604,12 +5604,12 @@ msgid "This server supports: %s"
 msgstr "Tento server podporuje: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Konec NAMES z !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Konec NAMES z \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Jména v !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Jména v \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5620,16 +5620,16 @@ msgid "Channel topic is: %Q"
 msgstr "Téma kanálu je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Téma pro !c%Q je: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Téma pro \r!c\r%Q\r je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Nenastaveno téma"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Žádné téma nebylo nastaveno pro kanál !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Žádné téma nebylo nastaveno pro kanál \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5640,20 +5640,20 @@ msgid "Topic was set by %Q"
 msgstr "Téma nastavil %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Téma pro !c%Q nastavil %Q v %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Téma pro \r!c\r%Q\r nastavil %Q v %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Téma pro !c%Q nastavil %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Téma pro \r!c\r%Q\r nastavil %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Mód kanálu pro !c%Q je %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Mód kanálu pro \r!c\r%Q\r je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Uživatelský mód !n%Q je %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Uživatelský mód \r!n\r%Q\r je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5662,8 +5662,8 @@ msgid "(Unknown)"
 msgstr "(Neznámý)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Konec kánalu %Q pro !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Konec kánalu %Q pro \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5678,8 +5678,8 @@ msgid "ban exception list"
 msgstr "seznam vyjímek banů"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q pro !c%Q: !m-%c%Q (nastavil %Q v %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q pro \r!c\r%Q\r: \r!m-%c\r%Q\r (nastavil %Q v %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5695,12 +5695,12 @@ msgstr "Seznam vyjímek banů"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"WHO záznam pro %c!n%Q%c [%Q@!h%Q]: %cKanál%c: !c%Q, "
-"%cServer%c: !s%Q, %cHopů%c: %d, %cFlagy%c: %Q, %cPryč%c: %Q, "
+"WHO záznam pro %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cKanál%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHopů%c: %d, %cFlagy%c: %Q, %cPryč%c: %Q, "
 "%cSkutečné jméno%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5722,8 +5722,8 @@ msgstr ""
 "Server odmítá všechny přihlašovací přezdívky: musíte nastavit přezdívku ručně"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Nelze se přihlásit jako '!n%Q' (%d: %Q), zkouší se '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Nelze se přihlásit jako '\r!n\r%Q\r' (%d: %Q), zkouší se '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5742,60 +5742,60 @@ msgid "End of help about %Q"
 msgstr "Konec nápovědy o %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c je pryč: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c je pryč: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c je %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c je %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c skutečné jméno: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c skutečné jméno: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c byl %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c byl %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c měl skutečné jméno: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c měl skutečné jméno: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c je v kanálech: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c je v kanálech: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr "Obdrženo poškozené RPL_WHOISIDLE, nelze spočítat dobu nečinnosti"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c nečinnost: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c nečinnost: %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c se připojil: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c se připojil: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c užívá server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c užívá server: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c byl autentifikován jako %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c byl autentifikován jako %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c info: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c WHOIS info z !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOIS info z \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c WHOWAS info z !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOWAS info z \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -5806,8 +5806,8 @@ msgid "Channel was created at %Q"
 msgstr "Kanál byl vytvořen v %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Kanál !c%Q byl vytvořen v %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Kanál \r!c\r%Q\r byl vytvořen v %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -5855,37 +5855,37 @@ msgstr "Nastavena pryč přezdívka (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!n%s%c server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!n\r%s\r%c server info: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!s%s%c administrátor je %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!s\r%s\r%c administrátor je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!s%s%c kontaktní adresa je %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!s\r%s\r%c kontaktní adresa je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q pozván %Q do kanálu %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r pozván %Q do kanálu %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!s%s%c informace:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!s\r%s\r%c informace:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Konec %c!s%s%c informací"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Konec %c\r!s\r%s\r%c informací"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%s%c čas je %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\r%c čas je %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -5917,8 +5917,8 @@ msgid "Your encoding is now %Q"
 msgstr "Vaše kódování je nyní %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c používá kódovou stránku %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c používá kódovou stránku %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7151,19 +7151,19 @@ msgstr "Společné kanály: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Cíl tohoto query se změnil z !n%Q [%Q@!h%Q] na !n%Q [%Q@!"
-"h%Q]"
+"Cíl tohoto query se změnil z \r!n\r%Q\r [%Q@\r!h\r%Q\r] na \r!n\r%Q\r [%Q@\r!"
+"h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Společné kanály s !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Společné kanály s \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Žádné společné kanály s !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Žádné společné kanály s \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/de.po b/translations/messages/kvirc/de.po
index b7b20dc3..a61f5356 100644
--- a/translations/messages/kvirc/de.po
+++ b/translations/messages/kvirc/de.po
@@ -2726,12 +2726,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Benachrichtigungsliste: !n%Q scheint online zu sein, aber die Maske "
-"(%Q@!h%Q) stimmt nicht überein (jemand  anderes benutzt den Spitznamen "
+"Benachrichtigungsliste: \r!n\r%Q\r scheint online zu sein, aber die Maske "
+"(%Q@\r!h\r%Q\r) stimmt nicht überein (jemand  anderes benutzt den Spitznamen "
 "oder die Registrierungsmaske(n) stimmt nicht überein)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2744,10 +2744,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Benachrichtigungsliste: Unerwartete Inkonsistenz: !n%Q in "
+"Benachrichtigungsliste: Unerwartete Inkonsistenz: \r!n\r%Q\r in "
 "registrierter Benutzer-Datenbank erwartet"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2786,12 +2786,14 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Benachrichtigungsliste: Es scheint, dass !n%Q offline gegangen ist, "
-"während auf seine USERHOST-Antwort gewartet wurde. Erneute Prüfung in der "
-"nächsten Schleife."
+"Benachrichtigungsliste: Es scheint, dass \n"
+"!n\n"
+"%Q\n"
+" offline gegangen ist, während auf seine USERHOST-Antwort gewartet wurde. "
+"Erneute Prüfung in der nächsten Schleife."
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
 msgid "Starting notify list"
@@ -2836,12 +2838,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Benachrichtigungsliste: !n%Q scheint online, aber die Maske (%Q@!h"
-"%Q) passt nicht (watch: jemand anderes benutzt seinen Spitznamen oder die "
+"Benachrichtigungsliste: \r!n\r%Q\r scheint online, aber die Maske (%Q@\r!h\r"
+"%Q\r) passt nicht (watch: jemand anderes benutzt seinen Spitznamen oder die "
 "Registrierungsmaske passt nicht)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2861,16 +2863,16 @@ msgid "removed from watch list"
 msgstr "gelöscht von Beobachtungsliste"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Benachrichtungsliste: Beobachtung für !n%Q wird gestoppt"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Benachrichtungsliste: Beobachtung für \r!n\r%Q\r wird gestoppt"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Benachrichtigungsliste: !n%Q ist offline (beobachtet)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Benachrichtigungsliste: \r!n\r%Q\r ist offline (beobachtet)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5457,13 +5459,13 @@ msgstr "Entladenes Modul '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Ignoriere DCC von !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignoriere DCC von \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Ignoriere die CTCP-Abfrage durch !n%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignoriere die CTCP-Abfrage durch \r!n\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5475,8 +5477,8 @@ msgid "Channel CTCP"
 msgstr "Kanal-CTCP"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q-Antwort von !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q-Antwort von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5484,10 +5486,10 @@ msgstr "Die nachfolgende CTCP-Abfrage hat das unerkanntes Ziel %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c-Abfrage durch !n%Q [%Q@!h%Q] (%Q) wurde ignoriert (die "
+"%Q %Q%c-Abfrage durch \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q) wurde ignoriert (die "
 "festgelegte Überflutungsgrenze wurde erreicht)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5503,8 +5505,8 @@ msgid "replied"
 msgstr "beantwortet"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c-Abfrage durch !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c-Abfrage durch \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5520,17 +5522,17 @@ msgstr ""
 "\": man sollte der angezeigen Zeit nicht vertrauen"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
-"%Q PING-Antwort von !n%Q [%Q@!h%Q]: %u Sekunden %u Millisekunden"
+"%Q PING-Antwort von \r!n\r%Q\r [%Q@r!h\r%Q\r]: %u Sekunden %u Millisekunden"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "Die nachfolgende CTCP ACTION-Antwort hat das unerkanntes Ziel \"%Q\""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION von !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5606,13 +5608,13 @@ msgstr ""
 "ignoriert"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "DDC %S-Abfrage durch !n%Q [%Q@!h%Q] (%Q %S) wird ignoriert"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "DDC %S-Abfrage durch \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S) wird ignoriert"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
-"DCC %Q-Abfrage durch !n%Q [%Q@!h%Q] (%Q %s) wird verarbeitet"
+"DCC %Q-Abfrage durch \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s) wird verarbeitet"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5628,14 +5630,18 @@ msgstr ""
 "scheint fehlerhaft zu sein"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr ""
-"Ein Ping wurde von !s%Q (PING %Q) empfangen: antwortete mit \"PONG\""
+"Ein Ping wurde von \r!s\r%Q\r (PING %Q) empfangen: antwortete mit \"PONG\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Ein Pong wurde von !s%s empfangen (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr ""
+"Ein Pong wurde von \n"
+"!s\n"
+"%s\n"
+" empfangen (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5653,18 +5659,18 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] hat !c%Q [implizite +%c "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat \r!c\r%Q\r [implizite +%c "
 "Benutzermodusänderung]  betreten"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] hat !c%Q betreten"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat \r!c\r%Q\r betreten"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] hat gerade !c%Q betreten"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat gerade \r!c\r%Q\r betreten"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5673,28 +5679,28 @@ msgstr ""
 "möglicherweise liegt Desynchronisation zwischen Server und Client vor"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Sie haben den Kanal !c%Q verlassen"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Sie haben den Kanal \r!c\r%Q\r verlassen"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Sie haben den Kanal !c%Q verlassen: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Sie haben den Kanal \r!c\r%Q\r verlassen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] hat !c%Q verlassen: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat \r!c\r%Q\r verlassen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] hat !c%Q verlassen"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat \r!c\r%Q\r verlassen"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!nc%Q [%Q@!h%Q] hat gerade !c%Q verlassen: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] hat gerade \r!c\r%Q\r verlassen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!nc%Q [%Q@!h%Q] hat gerade !c%Q verlassen"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] hat gerade \r!c\r%Q\r verlassen"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5703,8 +5709,8 @@ msgstr "Netzwerktrennung wurde erkannt: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] hat den IRC verlassen: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat den IRC verlassen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5714,28 +5720,33 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Von !c%Q von !n%Q [%Q@!h%Q] hinausgeworfen: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Von \r!c\r%Q\r von \r!n\r%Q\r [%Q@\r!h\r%Q\r] hinausgeworfen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Es wird versucht !c%Q erneut zu betreten..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr ""
+"Es wird versucht \n"
+"!c\n"
+"%Q\n"
+" erneut zu betreten\n"
+"..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] wurde aus !c%Q von !n%Q [%Q@!h%Q"
-"] hinausgeworfen: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] wurde aus \r!c\r%Q\r von \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r] hinausgeworfen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] wurde gerade aus !c%Q von !n%Q [%Q@!"
-"h%Q] hinausgeworfen: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] wurde gerade aus \r!c\r%Q\r von \r!n\r%Q\r [%Q@\r!"
+"h\r%Q\r] hinausgeworfen: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5746,23 +5757,23 @@ msgstr ""
 "Verschlüsselungsroutine konnte sie nicht dekodieren: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignoriere Anfragen-PRIVMSG von !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignoriere Anfragen-PRIVMSG von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Private Spamnachricht von !n%Q [%Q@!h%Q]: %Q (paßt auf das "
+"Private Spamnachricht von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (paßt auf das "
 "Spamwort \"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignoriere Kanal-PRIVMSG von !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignoriere Kanal-PRIVMSG von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignoriere Notiz von !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignoriere Notiz von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5780,9 +5791,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Spamnotiz von !n%Q [%Q@!h%Q]: %Q (paßt auf das Spamwort \"%Q\")"
+"Spamnotiz von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (paßt auf das Spamwort \"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
 msgid "Received a topic message for an unknown channel, possible desync"
@@ -5791,29 +5802,29 @@ msgstr ""
 "möglicherweise liegt Desynchronisation zwischen Server und Client vor"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] hat das Thema geändert auf \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat das Thema geändert auf \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] heißt nun !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] heißt nun \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Das Ziel dieser Anfrage wurde verloren, aber wiedergefunden, als !n%Q "
-"[%Q@!h%Q] seinen Spitznamen in !n%Q änderte"
+"Das Ziel dieser Anfrage wurde verloren, aber wiedergefunden, als \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r] seinen Spitznamen in \r!n\r%Q\r änderte"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Die letzte Spitznamenänderung von !n%Q nach !n%Q verursachte "
+"Die letzte Spitznamenänderung von \r!n\r%Q\r nach \r!n\r%Q\r verursachte "
 "eine Anfragenkollision: die Ausgabe wird zusammengeführt"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5821,8 +5832,8 @@ msgid "End of merged output"
 msgstr "Ende der zusammengeführten Ausgabe"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Ignoriere Invite von !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ignoriere Invite von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5833,9 +5844,9 @@ msgid "double-click the channel name to join"
 msgstr "Doppelklicken Sie auf den Kanalnamen, um ihn zu betreten"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr ""
-"!n%Q [%Q@!h%Q] hat Sie in den Kanal !c%Q (%Q) eingeladen"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] hat Sie in den Kanal \r!c\r%Q\r (%Q) eingeladen"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5845,8 +5856,8 @@ msgstr ""
 "Server und Client vor"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS von !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS von \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5860,33 +5871,33 @@ msgstr ""
 "möglicherweise liegt Desynchronisation zwischen Server und Client vor"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] hat den Kanalschlüssel auf \"!m-k%Q\" gesetzt"
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] hat den Kanalschlüssel auf \"\r!m-k\r%Q\r\" gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] hat den Kanalschlüssel aufgehoben"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] hat die Kanal-!m-lBegrenzung auf %Q gesetzt"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] hat die Kanal-\r!m-l\rBegrenzung auf %Q\r gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] hat die Kanalbegrenzung aufgehoben"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] hat den Modus %c%c !n%Q gesetzt"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] hat den Modus %c%c \r!n\r%Q\r gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] hat den Kanal-!m%c%c-Modus %c%c gesetzt"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] hat den Kanal-\r!m%c%c\r-Modus %c%c\r gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] hat den Modus %c%c !m%c%c%Q gesetzt"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] hat den Modus %c%c \r!m%c%c\r%Q\r gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5952,12 +5963,12 @@ msgid "This server supports: %s"
 msgstr "Der Server unterstützt: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Ende von NAMES für !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Ende von NAMES für \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Namen für !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Namen für \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5968,16 +5979,16 @@ msgid "Channel topic is: %Q"
 msgstr "Kanalthema ist: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Thema für !c%Q ist: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Thema für \r!c\r%Q\r ist: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Es ist kein Kanalthema gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Es ist kein Thema für Kanal !c%Q gesetzt"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Es ist kein Thema für Kanal \r!c\r%Q\r gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5988,20 +5999,20 @@ msgid "Topic was set by %Q"
 msgstr "Das Thema wurde von %Q gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Das Thema für !c%Q wurde von %Q am %Q gesetzt"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Das Thema für \r!c\r%Q\r wurde von %Q am %Q gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Das Thema für !c%Q wurde von %Q gesetzt"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Das Thema für \r!c\r%Q\r wurde von %Q gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Der Kanalmodus für !c%Q ist %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Der Kanalmodus für \r!c\r%Q\r ist %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Der Benutzermodus für !n%Q ist %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Der Benutzermodus für \r!n\r%Q\r ist %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -6010,8 +6021,8 @@ msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Ende der %Q für Kanal !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Ende der %Q für Kanal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -6026,8 +6037,8 @@ msgid "ban exception list"
 msgstr "Bannausnahmen-Liste"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q für !c%Q: !m-%c%Q (gesetzt von %Q am %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q für \r!c\r%Q\r: \r!m-%c\r%Q\r (gesetzt von %Q am %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -6043,12 +6054,12 @@ msgstr "Bannausnahmen-Auflistung"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"WHO-Eintrag für %c!n%Q%c [%Q@!h%Q]: %cKanal%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAbwesend%c: %Q, "
+"WHO-Eintrag für %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cKanal%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAbwesend%c: %Q, "
 "%cWirklicher Name%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -6072,9 +6083,9 @@ msgstr ""
 "bitte geben Sie manuell einen Spitznamen ein"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
-"Es gab keine Möglichkeit zum Einloggen als '!n%Q' (%d: %Q), es wird "
+"Es gab keine Möglichkeit zum Einloggen als '\r!n\r%Q\r' (%d: %Q), es wird "
 "'%Q' versucht ..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -6094,28 +6105,28 @@ msgid "End of help about %Q"
 msgstr "Ende der Hilfseinträge über %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c ist abwesend: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c ist abwesend: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c ist %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c ist %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%cs wirklicher Name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%cs wirklicher Name: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c wurde %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c wurde %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%cs wirklicher Name war: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%cs wirklicher Name war: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%cs Kanäle: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%cs Kanäle: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
@@ -6124,32 +6135,32 @@ msgstr ""
 "werden"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%cs Leerlaufzeit: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%cs Leerlaufzeit: %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%cs Einloggzeit: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%cs Einloggzeit: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%cs Server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%cs Server: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%cs ist authentisiert als %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%cs ist authentisiert als %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%cs Info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%cs Info: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c WHOIS-Info von !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOIS-Info von \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c WHOWAS-Info von !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOWAS-Info von \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -6160,8 +6171,8 @@ msgid "Channel was created at %Q"
 msgstr "Der Kanal wurde am %Q erstellt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Der Kanal !c%Q wurde am %Q erstellt"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Der Kanal \r!c\r%Q\r wurde am %Q erstellt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6211,37 +6222,41 @@ msgstr "Abwesend-Spitzname (%Q) wird gesetzt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!n%s%cs Server-Info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!n\r%s\r%cs Server-Info: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!s%s%cs Systemverwalter ist %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr ""
+"%c\n"
+"!n\n"
+"%s\n"
+"%cs Systemverwalter ist %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!n%s%cs Kontaktadresse ist %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!n\r%s\r%cs Kontaktadresse ist %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q hat !n%Q in den Kanal %Q eingeladen"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r hat \r!n\r%Q\r in den Kanal %Q eingeladen"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!n%s%cs Info:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!n\r%s\r%cs Info:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Ende aller bekannten Informationen über %c!s%s%c"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Ende aller bekannten Informationen über %c\r!s\r%s\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!n%s%cs Zeit ist %s"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!n\r%s\r%cs Zeit ist %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6273,8 +6288,8 @@ msgid "Your encoding is now %Q"
 msgstr "Ihre Kodierung ist nun %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%cs Codepage ist %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%cs Codepage ist %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7528,19 +7543,19 @@ msgstr "Gemeinsame Kanäle: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Das Ziel dieser Anfrage wurde von !n%Q [%Q@!h%Q] auf !n%Q "
-"[%Q@!h%Q] geändert"
+"Das Ziel dieser Anfrage wurde von \r!n\r%Q\r [%Q@\r!h\r%Q\r] auf \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r] geändert"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Gemeinsame Kanäle mit !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Gemeinsame Kanäle mit \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Sie haben keine gemeinsamen Kanäle mit !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Sie haben keine gemeinsamen Kanäle mit \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/es.po b/translations/messages/kvirc/es.po
index 0ab6f223..568df4d7 100644
--- a/translations/messages/kvirc/es.po
+++ b/translations/messages/kvirc/es.po
@@ -2681,12 +2681,12 @@ msgstr "cambió la máscara de registro o el nick está siendo usado por alguien
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Lista de notificación: Parece que !n%Q está conectado, pero la máscara "
-"[%Q@!h%Q] no concuerda (alguien está usando su nick o la máscara que "
+"Lista de notificación: Parece que \r!n\r%Q\r está conectado, pero la máscara "
+"[%Q@\r!h\r%Q\r] no concuerda (alguien está usando su nick o la máscara que "
 "usted puso no concuerda)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2699,11 +2699,11 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Lista de notificación: inconsistencia inesperada, esperaba tener a !n%Q"
-" en la BD de usuarios registrados..."
+"Lista de notificación: inconsistencia inesperada, esperaba tener a \r!n\r%Q"
+"\r en la BD de usuarios registrados..."
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
 #, c-format
@@ -2741,10 +2741,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Lista de notificación: Parece ser que !n%Q se desconectó mientras "
+"Lista de notificación: Parece ser que \r!n\r%Q\r se desconectó mientras "
 "esperaba su respuesta USERHOST, se recomprobará en el próximo ciclo"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2788,12 +2788,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Lista de notificación : !n%Q parece estar conectado, pero la máscara "
-"[%Q@!h%Q] no concuerda (watch: alguien más está usando su nick o su "
+"Lista de notificación : \r!n\r%Q\r parece estar conectado, pero la máscara "
+"[%Q@\r!h\r%Q\r] no concuerda (watch: alguien más está usando su nick o su "
 "máscara de registro no concuerda)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2813,16 +2813,16 @@ msgid "removed from watch list"
 msgstr "eliminada de la lista de vigilancia"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Lista de notificación: parando seguimiento para: !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Lista de notificación: parando seguimiento para: \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "vigilancia"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Lista de notificación: !n%Q  está desconectado (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Lista de notificación: \r!n\r%Q\r  está desconectado (watch)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5345,13 +5345,13 @@ msgstr "Descargado el módulo '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, fuzzy, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Ignorando PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorando PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, fuzzy, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Ignorando PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorando PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5364,8 +5364,8 @@ msgstr "CTCP de canal"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
 #, fuzzy
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %S respuesta de !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %S respuesta de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5374,10 +5374,10 @@ msgstr "La siguiente petición CTCP tiene un destino no reconocido %Q"
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 #, fuzzy
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"Petición %Q %S de !n%Q [%Q@!h%Q] (%Q), ignorada (límite de "
+"Petición %Q %S de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignorada (límite de "
 "saturación excedido)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5394,8 +5394,8 @@ msgstr "respondida"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
 #, fuzzy
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "petición %Q %S de !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "petición %Q %S de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5411,16 +5411,16 @@ msgstr ""
 "\", no confíe en el tiempo mostrado"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
-msgstr "Respuesta PING %Q de !n%Q [%Q@!h%Q]: %u segs %u msegs"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
+msgstr "Respuesta PING %Q de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u segs %u msegs"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "El siguiente CTCP ACTION tiene un destino no reconocido %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION de !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5490,14 +5490,14 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
 #, fuzzy
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Ignorando la petición DCC %S de !n%Q [%Q@!h%Q] (%S %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Ignorando la petición DCC %S de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%S %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
 #, fuzzy
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
-"Procesando petición DCC %Q solicitada desde !n%Q [%Q@!h%Q] (%Q "
+"Procesando petición DCC %Q solicitada desde \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q "
 "%s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5513,13 +5513,13 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
 #, fuzzy
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Recibido ping de !s%s (PING %s), respondido pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Recibido ping de \r!s\r%s\r (PING %s), respondido pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Recibido pong de !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Recibido pong de \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5536,50 +5536,50 @@ msgstr "Recibido un mensaje JOIN de un canal desconocido, posible desync?"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 #, fuzzy
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] se ha unido a !c%Q [cambio de modo-u "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] se ha unido a \r!c\r%Q\r [cambio de modo-u "
 "implícito +%c]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] se ha unido a !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] se ha unido a \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] se acaba de unir a !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] se acaba de unir a \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
 msgstr "Recibido un mensaje PART de un canal desconocido, posible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Has abandonado el canal !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Has abandonado el canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Has abandonado el canal !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Has abandonado el canal \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] ha abandonado !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha abandonado \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] ha abandonado !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha abandonado \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] se acaba de marchar !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] se acaba de marchar \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] se acaba de marchar !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] se acaba de marchar \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5588,8 +5588,8 @@ msgstr "Netsplit detectado: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] se ha marchado del IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] se ha marchado del IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5598,28 +5598,28 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Has sido expulsado de !c%Q por !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Has sido expulsado de \r!c\r%Q\r por \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Intentando volver a entrar !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Intentando volver a entrar \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] ha sido expulsado de !c%Q por !n%Q "
-"[%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha sido expulsado de \r!c\r%Q\r por \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] acaba de ser expulsado de !c%Q por !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] acaba de ser expulsado de \r!c\r%Q\r por \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 #, fuzzy
@@ -5632,25 +5632,25 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
 #, fuzzy
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorando PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorando PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"PRIVMSG spam de !n%Q [%Q@!h%Q]: %Q (palabra-spam coincidente \"%s"
+"PRIVMSG spam de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (palabra-spam coincidente \"%s"
 "\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
 #, fuzzy
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorando PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorando PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
 #, fuzzy
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorando PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorando PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5668,9 +5668,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Noticia spam de !n%Q [%Q@!h%Q]: %Q (palabra-spam coincidente \"%Q"
+"Noticia spam de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (palabra-spam coincidente \"%Q"
 "\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5678,29 +5678,29 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr "Recibido un mensaje de tema de un canal desconocido, posible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] ha cambiado el tema a \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha cambiado el tema a \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] se conoce ahora como !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] se conoce ahora como \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"El destino de este privado se perdió y ha sido encontrado cuando !n%Q "
-"[%Q@!h%Q] cambió su nick a !n%Q"
+"El destino de este privado se perdió y ha sido encontrado cuando \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r] cambió su nick a \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"El nick cambió de !n%Q a !n%Q y causó una colisión de privados: "
+"El nick cambió de \r!n\r%Q\r a \r!n\r%Q\r y causó una colisión de privados: "
 "mezclando la salida"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5709,8 +5709,8 @@ msgstr "Final de salida mezclada"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
 #, fuzzy
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Ignorando PRIVMSG de !n%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ignorando PRIVMSG de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5721,16 +5721,16 @@ msgid "double-click the channel name to join"
 msgstr "pulse dos veces en el nombre del canal para entrar"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] te invita al canal !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] te invita al canal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
 msgstr "Recibido un mensaje INVITE dirigido a otro nick, posible desync"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS de !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5742,33 +5742,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Recibido un cambio de modo de un canal desconocido, posible desync?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] ha cambiado la clave del canal a \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] ha cambiado la clave del canal a \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] ha quitado la clave del canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] ha puesto el límite del canal !m-la %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] ha puesto el límite del canal \r!m-l\ra %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] ha quitado el límite del canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] ha puesto el modo %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] ha puesto el modo %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] ha puesto el modo del canal !m%c%ca %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] ha puesto el modo del canal \r!m%c%c\ra %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] ha puesto el modo %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] ha puesto el modo %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5833,12 +5833,12 @@ msgid "This server supports: %s"
 msgstr "El servidor soporta: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Fin de NAMES para !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Fin de NAMES para \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Nombres para !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Nombres para \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5849,16 +5849,16 @@ msgid "Channel topic is: %Q"
 msgstr "El tema del canal es: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "El tema para !c%Q es: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "El tema para \r!c\r%Q\r es: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "No se ha puesto tema de canal"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "No se ha puesto tema para el canal !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "No se ha puesto tema para el canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 #, fuzzy
@@ -5872,21 +5872,21 @@ msgstr "El tema fue puesto por \r!n\r%Q\r!%Q@\r!h\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "El tema para !c%Q fue puesto por !n%Q!%Q@!h%Q el %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "El tema para \r!c\r%Q\r fue puesto por \r!n\r%Q\r!%Q@\r!h\r%Q\r el %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q"
-msgstr "El tema para !c%Q es: %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "El tema para \r!c\r%Q\r es: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "El modo de canal para !c%Q es %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "El modo de canal para \r!c\r%Q\r es %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Modo de usuario para !n%Q es %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Modo de usuario para \r!n\r%Q\r es %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5895,8 +5895,8 @@ msgid "(Unknown)"
 msgstr "(Desconocido)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Fin del canal %Q para !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Fin del canal %Q para \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5911,8 +5911,8 @@ msgid "ban exception list"
 msgstr "lista de excepciones a prohibiciones"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q para !c%Q: !m-%c%Q (puesto por %Q el %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q para \r!c\r%Q\r: \r!m-%c\r%Q\r (puesto por %Q el %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5928,12 +5928,12 @@ msgstr "Listado de excepciones a prohibiciones"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Entrada WHO para %c!n%Q%c [%Q@!h%Q]: %cCanal%c: !c%Q, "
-"%cServidor%c: !s%Q, %cSaltos%c: %d, %cFlags%c: %Q, %cAusentes%c: %Q, "
+"Entrada WHO para %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cCanal%c: \r!c\r%Q\r, "
+"%cServidor%c: \r!s\r%Q\r, %cSaltos%c: %d, %cFlags%c: %Q, %cAusentes%c: %Q, "
 "%cNombre real%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5957,9 +5957,9 @@ msgstr ""
 "enviar el nick de forma manual"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
-"No hay forma de autentificarse como '!n%Q' (%d: %Q), intentando '%Q'..."
+"No hay forma de autentificarse como '\r!n\r%Q\r' (%d: %Q), intentando '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5981,28 +5981,28 @@ msgid "End of help about %Q"
 msgstr "Fin de lista WHO para %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c está ausente: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c está ausente: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c es %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c es %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c's nombre real: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c's nombre real: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c era %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c era %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c's el nombre real era: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c's el nombre real era: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c's canales: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c's canales: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
@@ -6010,32 +6010,32 @@ msgstr ""
 "Recibido un RPL_WHOISIDLE erroneo, no puedo calcular el tiempo de espera"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c's tiempo de espera: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c's tiempo de espera: %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c's tiempo de entrada: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c's tiempo de entrada: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c's servidor: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c's servidor: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c está autentificado como %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c está autentificado como %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c's info: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c info WHOIS de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c info WHOIS de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c info WHOWAS de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c info WHOWAS de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -6046,8 +6046,8 @@ msgid "Channel was created at %Q"
 msgstr "El canal fue creado el %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "El canal !c%Q fue creado el %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "El canal \r!c\r%Q\r fue creado el %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6095,37 +6095,37 @@ msgstr "Poniendo el nick de modo ausente (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, fuzzy, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!s%s%c's info de servidor: %Q"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!s\r%s\r%c's info de servidor: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, fuzzy, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!s%s%c's el administrador es %Q"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!s\r%s\r%c's el administrador es %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, fuzzy, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!s%s%c's dirección de contacto es %Q"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!s\r%s\r%c's dirección de contacto es %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q invitado %Q al canal %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r invitado %Q al canal %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!s%s%c's información:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!s\r%s\r%c's información:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Fin de %c!s%s%c's información"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Fin de %c\r!s\r%s\r%c's información"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%s%c's hora es %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\r%c's hora es %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6160,8 +6160,8 @@ msgid "Your encoding is now %Q"
 msgstr "Tu codificación es ahora %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c's página de códigos es %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c's página de códigos es %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7416,19 +7416,19 @@ msgstr "Canales comunes: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"El destino de este privado ha cambiado de !n%Q [%Q@!h%Q] a !n"
-"%Q [%Q@!h%Q]"
+"El destino de este privado ha cambiado de \r!n\r%Q\r [%Q@\r!h\r%Q\r] a \r!n\r"
+"%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Canales comunes para !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Canales comunes para \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "No hay canales comunes para !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "No hay canales comunes para \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/es_AR.po b/translations/messages/kvirc/es_AR.po
index 8175764c..ac5d71df 100644
--- a/translations/messages/kvirc/es_AR.po
+++ b/translations/messages/kvirc/es_AR.po
@@ -2998,7 +2998,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -3011,7 +3011,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
 
@@ -3043,7 +3043,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
 
@@ -3085,7 +3085,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -3105,7 +3105,7 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -3113,7 +3113,7 @@ msgid "watch"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -5390,12 +5390,12 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -5408,7 +5408,7 @@ msgid "Channel CTCP"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -5417,7 +5417,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
 
@@ -5434,7 +5434,7 @@ msgid "replied"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5449,7 +5449,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5457,7 +5457,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5518,11 +5518,11 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5535,12 +5535,12 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
@@ -5557,15 +5557,15 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5573,27 +5573,27 @@ msgid "Received a part message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
@@ -5603,7 +5603,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
@@ -5612,23 +5612,23 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
@@ -5638,20 +5638,20 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5668,7 +5668,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5676,24 +5676,24 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5702,7 +5702,7 @@ msgid "End of merged output"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5714,7 +5714,7 @@ msgid "double-click the channel name to join"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
@@ -5722,7 +5722,7 @@ msgid "Received an invite message directed to another nick, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
@@ -5735,7 +5735,7 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
@@ -5743,7 +5743,7 @@ msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
@@ -5751,16 +5751,16 @@ msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
@@ -5817,11 +5817,11 @@ msgid "This server supports: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -5833,7 +5833,7 @@ msgid "Channel topic is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -5841,7 +5841,7 @@ msgid "No channel topic is set"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -5853,19 +5853,19 @@ msgid "Topic was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -5875,7 +5875,7 @@ msgid "(Unknown)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5891,7 +5891,7 @@ msgid "ban exception list"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
@@ -5908,8 +5908,8 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
 
@@ -5930,7 +5930,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5950,27 +5950,27 @@ msgid "End of help about %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -5978,31 +5978,31 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -6014,7 +6014,7 @@ msgid "Channel was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -6063,36 +6063,36 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -6125,7 +6125,7 @@ msgid "Your encoding is now %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -7338,16 +7338,16 @@ msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:424
diff --git a/translations/messages/kvirc/fi.po b/translations/messages/kvirc/fi.po
index 9283bd90..a5f65b8d 100644
--- a/translations/messages/kvirc/fi.po
+++ b/translations/messages/kvirc/fi.po
@@ -2572,7 +2572,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -2585,7 +2585,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
 
@@ -2617,7 +2617,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
 
@@ -2659,7 +2659,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -2679,7 +2679,7 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2687,7 +2687,7 @@ msgid "watch"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -5029,13 +5029,13 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Jätetään DCC huomiotta käyttäjältä !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Jätetään DCC huomiotta käyttäjältä \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Jätetään CTCP huomiotta käyttäjältä !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Jätetään CTCP huomiotta käyttäjältä \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5047,8 +5047,8 @@ msgid "Channel CTCP"
 msgstr "Kanava-CTCP"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q vastaus käyttäjältä !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q vastaus käyttäjältä \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5056,10 +5056,10 @@ msgstr "Seuraavalla CTCP pyynnöllä on ei-tunnistettu kohde %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c pyyntö käyttäjältä !n%Q [%Q@!h%Q] (%Q) jätettiin "
+"%Q %Q%c pyyntö käyttäjältä \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q) jätettiin "
 "huomiotta (tulvaraja ylitetty)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5075,8 +5075,8 @@ msgid "replied"
 msgstr "vastattiin"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c pyyntö käyttäjältä !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c pyyntö käyttäjältä \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5092,9 +5092,9 @@ msgstr ""
 "luota näytettyyn aikaan"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
-"%Q PING vastaus käyttäjältä !n%Q [%Q@!h%Q]: %u sekuntia, %u "
+"%Q PING vastaus käyttäjältä \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sekuntia, %u "
 "millisekuntia"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5102,7 +5102,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "Seuraavalla CTCP ACTION:lla on ei-tunnistettu kohde %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5163,11 +5163,11 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5180,13 +5180,13 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Vastaanotettiin ping käyttäjältä !s%Q (PING %Q), vastattiin"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Vastaanotettiin ping käyttäjältä \r!s\r%Q\r (PING %Q), vastattiin"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Vastaanotettiin pong käyttäjältä !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Vastaanotettiin pong käyttäjältä \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5202,44 +5202,44 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] on liittynyt kanavalle !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on liittynyt kanavalle \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] on juuri liittynyt kanavalle !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on juuri liittynyt kanavalle \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Olet poistunut kanavalta !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Olet poistunut kanavalta \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Olet poistunut kanavalta !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Olet poistunut kanavalta \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] on poistunut kanavalta !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on poistunut kanavalta \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] on poistunut kanavalta !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on poistunut kanavalta \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] on juuri poistunut kanavalta !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on juuri poistunut kanavalta \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] on juuri poistunut kanavalta !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on juuri poistunut kanavalta \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5248,8 +5248,8 @@ msgstr "Palvelinkatkaisu havaittu: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q[%Q@!h%Q] on lopettanut: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r[%Q@\r!h\r%Q\r] on lopettanut: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5257,30 +5257,30 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Sinut on potkittu kanavalta !c%Q käyttäjän !n%Q [%Q@!h%Q] "
+"Sinut on potkittu kanavalta \r!c\r%Q\r käyttäjän \r!n\r%Q\r [%Q@\r!h\r%Q\r] "
 "toimesta: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Aiotaan uudelleen liittyä kanavalle !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Aiotaan uudelleen liittyä kanavalle \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] on potkittu kanavalta !c%Q käyttäjän !n"
-"%Q [%Q@!h%Q] toimesta: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] on potkittu kanavalta \r!c\r%Q\r käyttäjän \r!n\r"
+"%Q\r [%Q@\r!h\r%Q\r] toimesta: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] on juuri potkittu kanavalta !c%Q käyttäjän "
-"!n%Q [%Q@!h%Q] toimesta: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] on juuri potkittu kanavalta \r!c\r%Q\r käyttäjän "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] toimesta: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5289,26 +5289,26 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Jätetään kyselyviesti käyttäjältä !nc%Q [%Q@!h%Q] huomiotta: %Q"
+"Jätetään kyselyviesti käyttäjältä \r!nc\r%Q\r [%Q@\r!h\r%Q\r] huomiotta: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Spam-viesti käyttäjältä !nc%Q [%Q@!h%Q]: %Q (täsmää spamsanan "
+"Spam-viesti käyttäjältä \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q (täsmää spamsanan "
 "\"%s\" kanssa)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Jätetään kanavaviesti käyttäjältä !nc%Q [%Q@!h%Q] huomiotta: %Q"
+"Jätetään kanavaviesti käyttäjältä \r!nc\r%Q\r [%Q@\r!h\r%Q\r] huomiotta: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Jätetään huomautus käyttäjältä !nc%Q [%Q@!h%Q] huomiotta: %Q"
+"Jätetään huomautus käyttäjältä \r!nc\r%Q\r [%Q@\r!h\r%Q\r] huomiotta: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5326,9 +5326,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Spam-huomautus käyttäjältä !nc%Q [%Q@!h%Q]: %Q (täsmää spamsanan "
+"Spam-huomautus käyttäjältä \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q (täsmää spamsanan "
 "\"%s\" kanssa)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5336,29 +5336,29 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] on vaihtanut kanavan aiheeksi \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] on vaihtanut kanavan aiheeksi \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] nyt tunnetaan käyttäjänä !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] nyt tunnetaan käyttäjänä \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Tämän kyselyn kohde hukattiin ja löydettiin uudelleen kun !n%Q [%Q@!h"
-"%Q] vaihtoi tunnuksekseen !n%Q"
+"Tämän kyselyn kohde hukattiin ja löydettiin uudelleen kun \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] vaihtoi tunnuksekseen \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Juuri tapahtunut tunnuksen vaihto käyttäjältä !n%Q to !n%Q "
+"Juuri tapahtunut tunnuksen vaihto käyttäjältä \r!n\r%Q\r to \r!n\r%Q\r "
 "aiheutti kyselytörmäyksen, liitetään sisällöt toisiinsa"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5366,8 +5366,8 @@ msgid "End of merged output"
 msgstr "Liitetyn sisällön loppu"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Jätetään kutsu !n%Q to !n%Q huomiotta"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Jätetään kutsu \r!n\r%Q\r to \r!n\r%Q\r huomiotta"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5378,16 +5378,16 @@ msgid "double-click the channel name to join"
 msgstr "tuplapainalla kanavan nimeä liittyäksesi"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] kutsuu sinut kanavalle !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] kutsuu sinut kanavalle \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS käyttäjältä !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS käyttäjältä \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5399,33 +5399,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] asetti kanavan salasanaksi \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] asetti kanavan salasanaksi \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] on poistanut kanavan salasanan"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] on asettanut kanavan !m-l rajaksi %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] on asettanut kanavan \r!m-l\r rajaksi %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q]  on poistanut kanavan rajan"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] on asettanut moodin %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] on asettanut moodin %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] on asettanut kanavan !m%c%cmoodin %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] on asettanut kanavan \r!m%c%c\rmoodin %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] on asettanut moodin %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] on asettanut moodin %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5490,11 +5490,11 @@ msgid "This server supports: %s"
 msgstr "Tämä palvelin tukee: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -5506,7 +5506,7 @@ msgid "Channel topic is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -5514,7 +5514,7 @@ msgid "No channel topic is set"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -5526,19 +5526,19 @@ msgid "Topic was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -5548,7 +5548,7 @@ msgid "(Unknown)"
 msgstr "(Tuntematon)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5564,8 +5564,8 @@ msgid "ban exception list"
 msgstr "bännipoikkeuslista"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q käyttäjälle !c%Q: !m-%c%Q (aika:%Q, asettaja: %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q käyttäjälle \r!c\r%Q\r: \r!m-%c\r%Q\r (aika:%Q, asettaja: %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5581,8 +5581,8 @@ msgstr "Bännipoikkeuslista"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr "/WHO-"
 
@@ -5603,7 +5603,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5623,27 +5623,27 @@ msgid "End of help about %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -5651,31 +5651,31 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -5687,7 +5687,7 @@ msgid "Channel was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -5736,36 +5736,36 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -5798,7 +5798,7 @@ msgid "Your encoding is now %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -7035,19 +7035,19 @@ msgstr "Yhteiset kanavat: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Tämän kyselyn kohde on vaihtunut käyttäjästä !n%Q [%Q@!h%Q] "
-"käyttäjään !n%Q [%Q@!h%Q]"
+"Tämän kyselyn kohde on vaihtunut käyttäjästä \r!n\r%Q\r [%Q@\r!h\r%Q\r] "
+"käyttäjään \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Yhteiset kanavat käyttäjän !n%Q [%Q@!h%Q] kanssa: %Q "
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Yhteiset kanavat käyttäjän \r!n\r%Q\r [%Q@\r!h\r%Q\r] kanssa: %Q "
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Ei yhteisiä kanavia käyttäjän %Q [%Q@!h%Q] kanssa."
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ei yhteisiä kanavia käyttäjän %Q\r [%Q@\r!h\r%Q\r] kanssa."
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/fr.po b/translations/messages/kvirc/fr.po
index 978318ee..4887b6d5 100644
--- a/translations/messages/kvirc/fr.po
+++ b/translations/messages/kvirc/fr.po
@@ -2698,12 +2698,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Liste de notifications : !n%Q semble être connecté, mais son mask [%Q@"
-"!h%Q] n'est pas le bon (le mask ne correspond pas a celui de "
+"Liste de notifications : \r!n\r%Q\r semble être connecté, mais son mask [%Q@"
+"\r!h\r%Q\r] n'est pas le bon (le mask ne correspond pas a celui de "
 "l'enregistrement, ou le pseudonyme est utilisé par quelqu'un d'autre)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2716,10 +2716,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Liste de notifications : Inconsistance,  !n%Q aurait dû être dans la "
+"Liste de notifications : Inconsistance,  \r!n\r%Q\r aurait dû être dans la "
 "base de donnée des utilisateurs"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2754,10 +2754,10 @@ msgstr "Liste de notifications : réponse d'USERHOST mal formatée ? (%s)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Liste de notifications : !n%Q semble s'être déconnecté avant le retour "
+"Liste de notifications : \r!n\r%Q\r semble s'être déconnecté avant le retour "
 "du USERHOST, nouvelle vérification au prochain passage"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2800,12 +2800,12 @@ msgstr "le mask a changé ou désynchronisation avec le service watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Liste de notifications : !n%Q semble connecté, mais le mask [%Q@!h"
-"%Q] ne correspond pas (watch: le mask d'enregistrement ne correspond pas, "
+"Liste de notifications : \r!n\r%Q\r semble connecté, mais le mask [%Q@\r!h\r"
+"%Q\r] ne correspond pas (watch: le mask d'enregistrement ne correspond pas, "
 "ou le pseudo est utilisé par quelqu'un d'autre)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2825,17 +2825,17 @@ msgid "removed from watch list"
 msgstr "supprimé de la liste watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
-"Liste de notifications : Interruption de la vérification watch de !n%Q"
+"Liste de notifications : Interruption de la vérification watch de \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Liste de notifications : !n%Q est déconnecté (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Liste de notifications : \r!n\r%Q\r est déconnecté (watch)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5359,13 +5359,13 @@ msgstr "Module dechargé '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "DCC de !nc%s [%s@!h%s] ignoré"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "DCC de \r!nc\r%s\r [%s@\r!h\r%s\r] ignoré"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "CTCP de !nc%s [%s@!h%s] ignoré"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "CTCP de \r!nc\r%s\r [%s@\r!h\r%s\r] ignoré"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5377,8 +5377,8 @@ msgid "Channel CTCP"
 msgstr "CTCP de salon"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "Réponse %Q %Q venant de !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Réponse %Q %Q venant de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5386,10 +5386,10 @@ msgstr "La requête CTCP suivant a une cible non reconnue %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"Requête %Q %Q%c venant de !n%Q [%Q@%Q] (%Q), ignorée (limite de flood "
+"Requête %Q %Q%c venant de \r!n\r%Q\r [%Q@%Q] (%Q), ignorée (limite de flood "
 "dépassée)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5405,8 +5405,8 @@ msgid "replied"
 msgstr "répondue"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "Requête %Q %Q%c venant de !n%Q [%Q@%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "Requête %Q %Q%c venant de \r!n\r%Q\r [%Q@%Q] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5422,7 +5422,7 @@ msgstr ""
 "\", ne faites pas confiance au temps affiché"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr "%Q réponse de PING venant de %Q [%Q@%Q]: %u sec %u msec"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5430,7 +5430,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "Le CTCP ACTION suivant a une cible inconnue %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "CTCP ACTION venant de %Q [%Q@%Q]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5497,13 +5497,13 @@ msgstr ""
 ": Ce pseudo n'est pas dans la base des utilisateurs, on ignore le changement"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Requête DCC %S venant de !n%Q [%Q@%Q] ignorée (%S %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Requête DCC %S venant de \r!n\r%Q\r [%Q@%Q] ignorée (%S %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
-"Traitement de la requête DCC %Q venant de !n%Q [%Q@!h%Q] (%Q %s)"
+"Traitement de la requête DCC %Q venant de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5519,13 +5519,13 @@ msgstr ""
 "défectueux"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Réception d'un ping venant de !s%Q (PING %Q), pong répondu"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Réception d'un ping venant de \r!s\r%Q\r (PING %Q), pong répondu"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Pong reçu de la part de !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Pong reçu de la part de \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5543,18 +5543,18 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] a rejoint !c%Q [changement d'umode +%c "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] a rejoint \r!c\r%Q\r [changement d'umode +%c "
 "implicite]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] a rejoint !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] a rejoint \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] vient d'arriver sur !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vient d'arriver sur \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5563,28 +5563,28 @@ msgstr ""
 "désynchronisation"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Vous venez partir du salon !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Vous venez partir du salon \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Vous venez de partir du salon !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Vous venez de partir du salon \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] vient de partir de !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vient de partir de \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] vient de partir de !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vient de partir de \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] vient de partir de !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vient de partir de \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] vient de partir de !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vient de partir de \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5593,8 +5593,8 @@ msgstr "Netsplit détecté : %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] a quitté IRC : %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] a quitté IRC : %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5604,29 +5604,29 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Vous avez été kické(e) de !c%Q par !n%Q [%Q@!h%Q] : %Q"
+"Vous avez été kické(e) de \r!c\r%Q\r par \r!n\r%Q\r [%Q@\r!h\r%Q\r] : %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Tentative pour rejoindre !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Tentative pour rejoindre \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] a été kické(e) !c%Q par !n%Q [%Q@!h"
-"%Q] : %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] a été kické(e) \r!c\r%Q\r par \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] : %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] vient juste d'être kické(e) !c%Q par !n"
-"%Q [%Q@!h%Q] : %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] vient juste d'être kické(e) \r!c\r%Q\r par \r!n\r"
+"%Q\r [%Q@\r!h\r%Q\r] : %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5637,23 +5637,23 @@ msgstr ""
 "décoder : %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Message privé de !nc%Q [%Q@!h%Q]: %Q ignoré"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Message privé de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q ignoré"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Privmsg de spam de la part de !n%Q [%Q@!h%Q] : %Q (correspondant "
+"Privmsg de spam de la part de r!n\r%Q\r [%Q@\r!h\r%Q\r] : %Q (correspondant "
 "au mot de spam \"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Message sur salon de !nc%Q [%Q@!h%Q]: %Q ignoré"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Message sur salon de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q ignoré"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Notice de !nc%Q [%Q@!h%Q]: %Q ignorée"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Notice de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q ignorée"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5672,9 +5672,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Notice de spam de la part de !n%Q [%Q@!h%Q] : %Q (correspond au "
+"Notice de spam de la part de \r!n\r%Q\r [%Q@\r!h\r%Q\r] : %Q (correspond au "
 "mot de spam \"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5682,29 +5682,29 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr "Réception du sujet d'un salon inconnu, probable désynchronisation"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] a changé le sujet du salon en \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] a changé le sujet du salon en \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] a changé de pseudo en !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] a changé de pseudo en \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"La cible de ce privé a été perdue puis retrouvée quand !n%Q [%Q@!h"
-"%Q] a changé de pseudo en !n%Q"
+"La cible de ce privé a été perdue puis retrouvée quand \r!n\r%Q\r [%Q@\r!h\r"
+"%Q\r] a changé de pseudo en \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Le récent changement de pseudo de !n%Q en !n%Q est responsable "
+"Le récent changement de pseudo de \r!n\r%Q\r en \r!n\r%Q\r est responsable "
 "d'une collision de pseudo : fusion des messages de sortie"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5712,8 +5712,8 @@ msgid "End of merged output"
 msgstr "Fin de la fusion des messages de sortie"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Invitation de !nc%Q [%Q@!h%Q] ignorée"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Invitation de \r!nc\r%Q\r [%Q@\r!h\r%Q\r] ignorée"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5724,8 +5724,8 @@ msgid "double-click the channel name to join"
 msgstr "double-cliquez sur le nom du salon pour le rejoindre"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] vous invite sur le salon !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vous invite sur le salon \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5734,8 +5734,8 @@ msgstr ""
 "désynchronisation"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS de !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5749,33 +5749,33 @@ msgstr ""
 "désynchronisation"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] a mis la clé de salon \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] a mis la clé de salon \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] a supprimé la clé de salon"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] a !m-llimité le salon à %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] a \r!m-l\rlimité le salon à %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] a supprimé la limite du salon"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] a mis le mode %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] a mis le mode %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] a mis le !m%c%cmode de salon %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] a mis le \r!m%c%c\rmode de salon %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] a mis le mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] a mis le mode %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5844,12 +5844,12 @@ msgid "This server supports: %s"
 msgstr "Ce serveur supporte : %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Fin des NAMES pour !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Fin des NAMES pour \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Names pour !c%Q : %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Names pour \r!c\r%Q\r : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5860,16 +5860,16 @@ msgid "Channel topic is: %Q"
 msgstr "Le sujet du salon est : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Le sujet pour !c%Q est : %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Le sujet pour \r!c\r%Q\r est : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Aucun sujet de salon n'est défini"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Aucun sujet n'est défini pour !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Aucun sujet n'est défini pour \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5880,20 +5880,20 @@ msgid "Topic was set by %Q"
 msgstr "Le sujet a été défini par %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Le sujet de !c%Q a été défini par %Q le %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Le sujet de \r!c\r%Q\r a été défini par %Q le %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Le sujet de !c%Q a été défini par %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Le sujet de \r!c\r%Q\r a été défini par %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Le mode de salon pour !c%Q est %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Le mode de salon pour \r!c\r%Q\r est %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Le mode utilisateur pour !n%Q est %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Le mode utilisateur pour \r!n\r%Q\r est %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5902,8 +5902,8 @@ msgid "(Unknown)"
 msgstr "(Inconnu)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Fin de la %Q du salon pour !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Fin de la %Q du salon pour \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5918,8 +5918,8 @@ msgid "ban exception list"
 msgstr "liste des exceptions de ban"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q sur !c%Q : !m-%c%Q (mis par %Q le %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q sur \r!c\r%Q\r : \r!m-%c\r%Q\r (mis par %Q le %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5935,12 +5935,12 @@ msgstr "Listage des exceptions de ban"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"WHO de %c!n%Q%c [%Q@!h%Q] : %cSalon%c: !c%Q, %cServeur%c: "
-"!s%Q, %cHops%c: %d, %cDrapeaux%c: %Q, %cAbsence%c: %Q, %cNom réel%c: %Q"
+"WHO de %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r] : %cSalon%c: \r!c\r%Q\r, %cServeur%c: "
+"\r!s\r%Q\r, %cHops%c: %d, %cDrapeaux%c: %Q, %cAbsence%c: %Q, %cNom réel%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
 msgid "End of WHO list for %Q"
@@ -5963,9 +5963,9 @@ msgstr ""
 "entrer un manuellement"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
-"Impossible de vous enregistrer en tant que '!n%Q' (%d: %Q), essai de "
+"Impossible de vous enregistrer en tant que '\r!n\r%Q\r' (%d: %Q), essai de "
 "'%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5985,28 +5985,28 @@ msgid "End of help about %Q"
 msgstr "Fin de l'aide à propos de %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c est absent : %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c est absent : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c est %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c est %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c au nom réel : %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c au nom réel : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c était %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c était %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c au nom réel : %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c au nom réel : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c est sur : %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c est sur : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
@@ -6015,32 +6015,32 @@ msgstr ""
 "d'inactivité"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c au temps d'inactivité : %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c au temps d'inactivité : %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c s'est connecté le : %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c s'est connecté le : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c est sur le serveur : !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c est sur le serveur : \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c est authentifié en tant que  %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c est authentifié en tant que  %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c à l'info : %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c à l'info : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c au WHOIS venant de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c au WHOIS venant de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c au WHOWAS venant de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c au WHOWAS venant de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -6051,8 +6051,8 @@ msgid "Channel was created at %Q"
 msgstr "Le salon a été crée le %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Le salon !c%Q a été crée le %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Le salon \r!c\r%Q\r a été crée le %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6100,37 +6100,37 @@ msgstr "Utilisation du pseudo d'absence (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!s%s%c à l'info du serveur : %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!s\r%s\r%c à l'info du serveur : %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!n%s%c à l'info : %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!n\r%s\r%c à l'info : %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!s%s%c a pour adresse de contact %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!s\r%s\r%c a pour adresse de contact %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q a invité %Q sur le salon %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r a invité %Q sur le salon %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!s%s%c à l'info :"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!s\r%s\r%c à l'info :"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Fin des informations de %c!s%s%c"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Fin des informations de %c\r!s\r%s\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%s%c a comme heure %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\r%c a comme heure %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6162,8 +6162,8 @@ msgid "Your encoding is now %Q"
 msgstr "Votre mode utilisateur est %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c a pour codegape %Q : %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c a pour codegape %Q : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7405,19 +7405,19 @@ msgstr "Salons en commun : %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"La cible de ce privé a changé de !n%Q [%Q@!h%Q] vers !n%Q "
-"[%Q@!h%Q]"
+"La cible de ce privé a changé de \r!n\r%Q\r [%Q@\r!h\r%Q\r] vers \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Salons communs avec !n%Q [%Q@!h%Q] : %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Salons communs avec \r!n\r%Q\r [%Q@\r!h\r%Q\r] : %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Aucun salon commun avec !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Aucun salon commun avec \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/hr.po b/translations/messages/kvirc/hr.po
index 41da385b..85185e9a 100644
--- a/translations/messages/kvirc/hr.po
+++ b/translations/messages/kvirc/hr.po
@@ -2569,7 +2569,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -2582,7 +2582,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
 
@@ -2614,7 +2614,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
 
@@ -2656,7 +2656,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -2676,7 +2676,7 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2684,7 +2684,7 @@ msgid "watch"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -4965,12 +4965,12 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -4983,7 +4983,7 @@ msgid "Channel CTCP"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -4992,7 +4992,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
 
@@ -5009,7 +5009,7 @@ msgid "replied"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5024,7 +5024,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5032,7 +5032,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5093,11 +5093,11 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5110,12 +5110,12 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
@@ -5132,15 +5132,15 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] je uš[ao/la] u !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je uš[ao/la] u \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5148,28 +5148,28 @@ msgid "Received a part message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Napustili ste sobu !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Napustili ste sobu \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Napustili ste sobu !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Napustili ste sobu \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] je napusti[o/la] !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je napusti[o/la] \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] je napusti[o/la] !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je napusti[o/la] \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!nc%Q [%Q@!h%Q] je upravo napusti[o/la] !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] je upravo napusti[o/la] \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!nc%Q [%Q@!h%Q] je upravo napusti[o/la] !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] je upravo napusti[o/la] \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5178,8 +5178,8 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] je napusti[o/la] IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je napusti[o/la] IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5187,25 +5187,25 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Izbačeni ste s !c%Q od !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Izbačeni ste s \r!c\r%Q\r od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] je izbačen[a] s !c%Q od !n%Q [%Q@!h"
-"%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] je izbačen[a] s \r!c\r%Q\r od \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
@@ -5215,20 +5215,20 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5245,7 +5245,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5253,26 +5253,26 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] je promijeni[o/la] temu u \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je promijeni[o/la] temu u \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] je sada poznat[a] kao !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je sada poznat[a] kao \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Odredište ovog razgovora je izgubljeno i opet pronađeno kada !n%Q [%Q@"
-"!h%Q] je promijeni[o/la] svoj nadimak u !n%Q"
+"Odredište ovog razgovora je izgubljeno i opet pronađeno kada \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r] je promijeni[o/la] svoj nadimak u \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5281,7 +5281,7 @@ msgid "End of merged output"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5293,7 +5293,7 @@ msgid "double-click the channel name to join"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
@@ -5301,7 +5301,7 @@ msgid "Received an invite message directed to another nick, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
@@ -5314,7 +5314,7 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
@@ -5322,7 +5322,7 @@ msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
@@ -5330,17 +5330,17 @@ msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] je postavi[o/la] mod %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] je postavi[o/la] mod %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] je postavi[o/la] mod %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] je postavi[o/la] mod %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5396,11 +5396,11 @@ msgid "This server supports: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -5412,7 +5412,7 @@ msgid "Channel topic is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -5420,7 +5420,7 @@ msgid "No channel topic is set"
 msgstr "Tema sobe nije postavljena"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -5432,19 +5432,19 @@ msgid "Topic was set by %Q"
 msgstr "Temu je postavi[o/la] %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -5454,7 +5454,7 @@ msgid "(Unknown)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5470,7 +5470,7 @@ msgid "ban exception list"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
@@ -5487,8 +5487,8 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
 
@@ -5509,7 +5509,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5529,27 +5529,27 @@ msgid "End of help about %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -5557,31 +5557,31 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -5593,7 +5593,7 @@ msgid "Channel was created at %Q"
 msgstr "Soba je kreirana %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -5642,36 +5642,36 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -5704,7 +5704,7 @@ msgid "Your encoding is now %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -6935,19 +6935,19 @@ msgstr "Zajedničke sobe: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Odredište ovog privatnog razgovora se promijenilo iz !n%Q [%Q@!h%Q"
-"] u !n%Q [%Q@!h%Q]"
+"Odredište ovog privatnog razgovora se promijenilo iz \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r] u \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Zajedničke sobe za !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Zajedničke sobe za \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Nema zajedničkih soba za !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Nema zajedničkih soba za \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/hu.po b/translations/messages/kvirc/hu.po
index c1f8e8ab..e958545b 100644
--- a/translations/messages/kvirc/hu.po
+++ b/translations/messages/kvirc/hu.po
@@ -2636,11 +2636,11 @@ msgstr "Regisztrációs maszk megváltozott, vagy a Nevet más használja"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Értesítési lista: !n%Q látszólag elérhető, de a maszk [%Q@!h%Q] "
+"Értesítési lista: \r!n\r%Q\r látszólag elérhető, de a maszk [%Q@\r!h\r%Q\r] "
 "nem egyezik (maszk nem egyezik, vagy a Nevet valaki más használja)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2653,10 +2653,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Értesítési lista: Váratlan inkonzisztencia, hiányzó !n%Q a regisztrált "
+"Értesítési lista: Váratlan inkonzisztencia, hiányzó \r!n\r%Q\r a regisztrált "
 "felhasználói adatbázisban"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2690,10 +2690,10 @@ msgstr "Értesítési lista: Hibás USERHOST válasz a szervertől? (%s) "
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Értesítési lista: !n%Q látszólag eltűnt mielőtt válaszolt volna a "
+"Értesítési lista: \r!n\r%Q\r látszólag eltűnt mielőtt válaszolt volna a "
 "USERHOST kérésre, újraellenőrzés legközelebbi alkalommal"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2736,11 +2736,11 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Értesítési lista: !n%Q látszólag elérhető, de a maszk [%Q@!h%Q] "
+"Értesítési lista: \r!n\r%Q\r látszólag elérhető, de a maszk [%Q@\r!h\r%Q\r] "
 "nem egyezik (regisztrációs maszk nem egyezik, vagy a Nevet valaki más "
 "használja)"
 
@@ -2761,16 +2761,16 @@ msgid "removed from watch list"
 msgstr "eltávolítva a figyelő listáról"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Értesítési lista: Figyelés leállítása: !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Értesítési lista: Figyelés leállítása: \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "figyelés"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Értesítési lista: !n%Q nem elérhető (figyelt)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Értesítési lista: \r!n\r%Q\r nem elérhető (figyelt)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5078,13 +5078,13 @@ msgstr "Eltávolított modul %s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "CTCP mellőzve: !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "CTCP mellőzve: \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "CTCP mellőzve: !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "CTCP mellőzve: \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5096,8 +5096,8 @@ msgid "Channel CTCP"
 msgstr "Csatorna CTCP"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q válasz !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q válasz \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5105,10 +5105,10 @@ msgstr "%Q CTCP kérésnek ismeretlen a címzettje"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q %c kérés !n%Q [%Q@!h%Q] (%Q), mellőzve (árasztási küszöböt "
+"%Q %Q %c kérés \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), mellőzve (árasztási küszöböt "
 "meghaladta)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5124,8 +5124,8 @@ msgid "replied"
 msgstr "megválaszolva"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q %c kérés !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q %c kérés \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5141,16 +5141,16 @@ msgstr ""
 "megjelenített időértékben"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
-msgstr "%Q PING válasz !n%Q [%Q@!h%Q]: %u mp %u mmp"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
+msgstr "%Q PING válasz \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u mp %u mmp"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "%Q CTCP ACTION-nak ismeretlen a célpontja"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5218,12 +5218,12 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ": Nincs ilyen felhasználónév az adatbázisban, változás mellőzése"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "DCC kérés %S mellőzve: !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "DCC kérés %S mellőzve: \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "DCC válasz: %Q kérés: !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "DCC válasz: %Q kérés: \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5236,13 +5236,13 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr "Fenti kérés teljesítése sikertelen. DCC modul valószínűleg megsérült."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Ping kérés: !s%Q (PING %Q), megválaszolva: pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Ping kérés: \r!s\r%Q\r (PING %Q), megválaszolva: pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Beérkezett pong: !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Beérkezett pong: \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5260,19 +5260,19 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] csatlakozott: !c%Q [implicit +%c umode "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] csatlakozott: \r!c\r%Q\r [implicit +%c umode "
 "change]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] csatlakozott a(z) !c%Q csatornára."
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] csatlakozott a(z) \r!c\r%Q\r csatornára."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
-"!n%Q [%Q@!h%Q] épp most csatlakozott !c%Q csatornára."
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] épp most csatlakozott \r!c\r%Q\r csatornára."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5280,29 +5280,29 @@ msgstr ""
 "Ismeretlen csatornáról lelépő üzenetet kaptam, valószínűleg szinkron hiba"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Leléptél !c%Q csatornáról"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Leléptél \r!c\r%Q\r csatornáról"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Leléptél !c%Q: %Q csatornáról"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Leléptél \r!c\r%Q\r: %Q csatornáról"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] lelépett !c%Q: csatornáról: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] lelépett \r!c\r%Q\r: csatornáról: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] lelépett a(z) !c%Q csatornáról."
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] lelépett a(z) \r!c\r%Q\r csatornáról."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr ""
-"!nc%Q [%Q@!h%Q] épp most lépett le !c%Q csatornáról: %Q "
+"\r!nc\r%Q\r [%Q@\r!h\r%Q\r] épp most lépett le \r!c\r%Q\r csatornáról: %Q "
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!nc%Q [%Q@!h%Q] épp most lépett le !c%Q csatornáról."
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] épp most lépett le \r!c\r%Q\r csatornáról."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5311,8 +5311,8 @@ msgstr "Netsplitet észleltem: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] kilépett IRCről: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] kilépett IRCről: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5320,30 +5320,30 @@ msgstr "Ismeretlen csatornáról kaptam kirúgó üzenetet, valószínűleg desz
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!c%Q csatornáról ki lettél rúgva !n%Q [%Q@!h%Q] által. "
+"\r!c\r%Q\r csatornáról ki lettél rúgva \r!n\r%Q\r [%Q@\r!h\r%Q\r] által. "
 "Indok: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Újracsatlakozási próbálkozás !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Újracsatlakozási próbálkozás \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] kirúgva !c%Q csatornáról !n%Q [%Q@!h"
-"%Q]: által, indok: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] kirúgva \r!c\r%Q\r csatornáról \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r]: által, indok: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] éppen kirúgta !c%Q csatornáról !n%Q "
-"[%Q@!h%Q]. Indok: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] éppen kirúgta \r!c\r%Q\r csatornáról \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r]. Indok: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5353,22 +5353,22 @@ msgstr ""
 "A következő üzenet titkosított, de a titkosító képtelen volt dekódolni: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "PRIVMSG mellőzve !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "PRIVMSG mellőzve \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Privát spam üzenet: !n%Q [%Q@!h%Q]: %Q (egyező spam-szó \"%s\")"
+"Privát spam üzenet: \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (egyező spam-szó \"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "PRIVMSG mellőzve !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "PRIVMSG mellőzve \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "PRIVMSG mellőzve !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "PRIVMSG mellőzve \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5386,9 +5386,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Spam éretesítés: !n%Q [%Q@!h%Q]: %Q (egyező spam szó \"%Q\")"
+"Spam éretesítés: \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (egyező spam szó \"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
 msgid "Received a topic message for an unknown channel, possible desync"
@@ -5396,30 +5396,30 @@ msgstr ""
 "Ismeretlen csatorna topik üzenetét kaptam meg, valószínűleg szinkron hiba"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
 msgstr ""
-"!n%Q [%Q@!h%Q] megváltoztatta a csatorna topicját: \"%Q%c\""
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] megváltoztatta a csatorna topicját: \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] mostantól: !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] mostantól: \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Ennek a privátnak a célját elvesztettem, és megtaláltam, amikor !n%Q "
-"[%Q@!h%Q] megváltoztatta a nevét !n%Q -ra/re."
+"Ennek a privátnak a célját elvesztettem, és megtaláltam, amikor \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r] megváltoztatta a nevét \r!n\r%Q\r -ra/re."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"A most történt névváltás !n%Q -ról !n%Q -ra privát ütközést "
+"A most történt névváltás \r!n\r%Q\r -ról \r!n\r%Q\r -ra privát ütközést "
 "okozott:kimenet összevágása"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5427,8 +5427,8 @@ msgid "End of merged output"
 msgstr "Összevágott kimenet vége"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Meghívás mellőzése !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Meghívás mellőzése \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5439,16 +5439,16 @@ msgid "double-click the channel name to join"
 msgstr "Dupla kattintás a csatorna nevére a csatlakozáshoz"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] meghívott a !c%Q (%Q) csatornára."
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] meghívott a \r!c\r%Q\r (%Q) csatornára."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
 msgstr "Meghívó üzenet érkezett, de másnak lett címezve: szinkron hiba"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5460,33 +5460,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Ismeretlen csatorna módváltását észleltem, szinkron hiba"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] beállította a csatorna kulcsát: \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] beállította a csatorna kulcsát: \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] eltávolította a csatorna kulcsát"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] beállította a csatorna !m-llimitjét: %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] beállította a csatorna \r!m-l\rlimitjét: %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] eltávolította a csatorna limitjét"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] módot váltott: %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] módot váltott: %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] beállította a !m%c%c csatorna módjait: %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] beállította a \r!m%c%c\r csatorna módjait: %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] módot váltott %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] módot váltott %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5551,12 +5551,12 @@ msgid "This server supports: %s"
 msgstr "Támogatott tulajdonságok: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "!c%Q NAMES lista vége."
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "\r!c\r%Q\r NAMES lista vége."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Nevek a !c%Q-n: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Nevek a \r!c\r%Q\r-n: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5567,16 +5567,16 @@ msgid "Channel topic is: %Q"
 msgstr "Csatorna topic: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "!c%Q csatorna topicja: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "\r!c\r%Q\r csatorna topicja: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Nincs csatorna topik beállítva"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Nincs topic beállítva !c%Q csatornán."
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Nincs topic beállítva \r!c\r%Q\r csatornán."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5587,20 +5587,20 @@ msgid "Topic was set by %Q"
 msgstr "%Q állította be a topikot"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "!c%Q csatorna topikját %Q állította be. Beállítás ideje: %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "\r!c\r%Q\r csatorna topikját %Q állította be. Beállítás ideje: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "!c%Q csatorna topikja: %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "\r!c\r%Q\r csatorna topikja: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "!c%Q csatorna módjai: %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "\r!c\r%Q\r csatorna módjai: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "!n%Q felhasználó módjai: %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "\r!n\r%Q\r felhasználó módjai: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5609,7 +5609,7 @@ msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5625,8 +5625,8 @@ msgid "ban exception list"
 msgstr "tiltó kivétel lista"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q - !c%Q: !m-%c%Q (beállította %Q ~ %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q - \r!c\r%Q\r: \r!m-%c\r%Q\r (beállította %Q ~ %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5642,12 +5642,12 @@ msgstr "Tiltó kivételek listázása"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"WHO bejegyzés: %c!n%Q%c [%Q@!h%Q]: %c csatorna%c: !c%Q, "
-"%cSzerver%c: !s%Q, %cHop: %c: %d, %cFlagek%c: %Q, %cTávol%c: %Q, "
+"WHO bejegyzés: %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %c csatorna%c: \r!c\r%Q\r, "
+"%cSzerver%c: \r!s\r%Q\r, %cHop: %c: %d, %cFlagek%c: %Q, %cTávol%c: %Q, "
 "%cValósnév%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5671,8 +5671,8 @@ msgstr ""
 "nick becenév)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Belépés mint '!n%Q' (%d: %Q) nem lehetséges, próbálom így: '%Q'."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Belépés mint '\r!n\r%Q\r' (%d: %Q) nem lehetséges, próbálom így: '%Q'."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5691,60 +5691,60 @@ msgid "End of help about %Q"
 msgstr "%Q segíség vége"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c Nem elérhető: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c Nem elérhető: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c - %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c - %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c valós neve: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c valós neve: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c volt %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c volt %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c valós neve: %Q volt."
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c valós neve: %Q volt."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c csatornái: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c csatornái: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr "Hibás RPL_WHOISIDLE válasz, nem tudom felmérni a tétlenségi időt"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c tétlen: %un %uó %up %ump"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c tétlen: %un %uó %up %ump"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c kapcsolódási ideje: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c kapcsolódási ideje: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c szervere: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c szervere: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c azonosítva, mint: %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c azonosítva, mint: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c infó: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c infó: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c WHOIS infó !s%Q szervertől."
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOIS infó \r!s\r%Q\r szervertől."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c WHOWAS infó !s%Q szervertől."
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOWAS infó \r!s\r%Q\r szervertől."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -5755,8 +5755,8 @@ msgid "Channel was created at %Q"
 msgstr "Csatorna létrehozva: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "!c%Q csatorna létrehozva: %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "\r!c\r%Q\r csatorna létrehozva: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -5804,37 +5804,37 @@ msgstr "Távollétet jelző nick beállítása (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!s%s%c szerver infó: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!s\r%s\r%c szerver infó: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!s%s%c adminisztrátora: %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!s\r%s\r%c adminisztrátora: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!s%s%c elérhetőségei: %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!s\r%s\r%c elérhetőségei: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q meghívta '%Q'-t a %Q csatornára."
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r meghívta '%Q'-t a %Q csatornára."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!s%s%c információi:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!s\r%s\r%c információi:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "%c!s%s%c információinak vége"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "%c\r!s\r%s\r%c információinak vége"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%s%c ideje: %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\r%c ideje: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -5866,8 +5866,8 @@ msgid "Your encoding is now %Q"
 msgstr "A kódolásod mostantól %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c kódlapja: %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c kódlapja: %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7100,19 +7100,19 @@ msgstr "Közös csatornák: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"A privát célja megváltozott !n%Q [%Q@!h%Q] -ról/ről !n%Q "
-"[%Q@!h%Q] -ra/re."
+"A privát célja megváltozott \r!n\r%Q\r [%Q@\r!h\r%Q\r] -ról/ről \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r] -ra/re."
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Közös csatornáitok !n%Q : [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Közös csatornáitok \r!n\r%Q\r : [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Nincsen közös csatornátok: !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Nincsen közös csatornátok: \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/it.po b/translations/messages/kvirc/it.po
index 5a305624..1c5c875f 100644
--- a/translations/messages/kvirc/it.po
+++ b/translations/messages/kvirc/it.po
@@ -2673,12 +2673,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Notify List: !n%Q sembra essere online, ma la maschera [%Q@!h%Q"
-"]non corrisponde (qualcun'altro sta usando il suo nickname o la sua "
+"Notify List: \r!n\r%Q\r sembra essere online, ma la maschera [%Q@\r!h\r%Q"
+"\r]non corrisponde (qualcun'altro sta usando il suo nickname o la sua "
 "maschera di registrazione non corrisponde)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2691,10 +2691,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Notify List: inconsistenza inaspettata, atteso !n%Q nel database degli "
+"Notify List: inconsistenza inaspettata, atteso \r!n\r%Q\r nel database degli "
 "utenti registrati"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2731,10 +2731,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Notify List: sembra che !n%Q sia andato offline mentre aspettavo la "
+"Notify List: sembra che \r!n\r%Q\r sia andato offline mentre aspettavo la "
 "sua risposta all'USERHOST, lo ricontrollerò la prossima volta"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2779,11 +2779,11 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Notify List: !n%Q sembra essere online, ma la maschera [%Q@!h%Q] "
+"Notify List: \r!n\r%Q\r sembra essere online, ma la maschera [%Q@\r!h\r%Q\r] "
 "non corrisponde (watch: qualcun'altro sta usando il suo nickname o la sua "
 "maschera di registrazione non corrisponde)"
 
@@ -2804,16 +2804,16 @@ msgid "removed from watch list"
 msgstr "rimosso dalla Lista Watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Notify List: smetto di controllare !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Notify List: smetto di controllare \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "monitora"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Notify List: !n%Q è offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Notify List: \r!n\r%Q\r è offline (watch)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5295,13 +5295,13 @@ msgstr "Modulo '%s' non caricato"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Ignorato CTCP da !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorato CTCP da \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Ignorato CTCP da !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorato CTCP da \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5313,8 +5313,8 @@ msgid "Channel CTCP"
 msgstr "CTCP al Canale"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q risposta da !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q risposta da \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5322,10 +5322,10 @@ msgstr "La seguente richiesta CTCP ha un destinatario sconosciuto %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c richiesta da !n%Q [%Q@!h%Q] (%Q), ignorata (raggiunto "
+"%Q %Q%c richiesta da \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignorata (raggiunto "
 "limite di flood)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5341,8 +5341,8 @@ msgid "replied"
 msgstr "risposto"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c richiesta da !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c richiesta da \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5358,7 +5358,7 @@ msgstr ""
 "\": l'orario mostrato è inattendibile"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr "%Q risposta PING da %Q [%Q@%Q]: %u sec %u msec"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5366,7 +5366,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "La seguente CTCP ACTION ha un destinatario sconosciuto %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "CTCP ACTION da %Q [%Q@%Q]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5435,12 +5435,12 @@ msgstr ""
 ": questo nickname non è nel database degli utenti, ignoro i cambiamenti"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Ignoro DCC %S richiesta da !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Ignoro DCC %S richiesta da \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "Elaborazione DCC %Q richiesta da !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "Elaborazione DCC %Q richiesta da \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5454,13 +5454,13 @@ msgstr ""
 "malfunzionante"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Ricevuto PING da !s%s (PING %Q), inviata risposta PONG"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Ricevuto PING da \r!s\r%s\r (PING %Q), inviata risposta PONG"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Ricevuto PONG da !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Ricevuto PONG da \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5477,18 +5477,18 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] è entrato in !c%Q [implicito +%c cambio "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] è entrato in \r!c\r%Q\r [implicito +%c cambio "
 "modo utente]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] è entrato in !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è entrato in \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] è appena entrato in !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è appena entrato in \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5496,28 +5496,28 @@ msgstr ""
 "Ricevuto mesasggio di uscita per un Canale sconosciuto, possibile asincronia"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Sei uscito dal Canale !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Sei uscito dal Canale \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Sei uscito dal Canale !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Sei uscito dal Canale \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] è uscito da !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è uscito da \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] è uscito da !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è uscito da \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] è appena uscito da !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è appena uscito da \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] è appena uscito da !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è appena uscito da \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5526,8 +5526,8 @@ msgstr "Rilevato Netsplit: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] è uscito da IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] è uscito da IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5536,28 +5536,28 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Sei stato kickato da !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Sei stato kickato da \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Provo a rientrare nel Canale !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Provo a rientrare nel Canale \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] è stato kickato dal canale !c%Q da !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] è stato kickato dal canale \r!c\r%Q\r da \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] è appena stato kickato dal canale !c%Q da "
-"!n%Q [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] è appena stato kickato dal canale \r!c\r%Q\r da "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5568,23 +5568,23 @@ msgstr ""
 "fallito nella decodifica: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorato Messaggio Privato da !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorato Messaggio Privato da \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Messaggio privato di Spam da !n%Q [%Q@!h%Q]: %Q (parola di Spam "
+"Messaggio privato di Spam da \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (parola di Spam "
 "corrispondente \"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorato Messaggio da !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorato Messaggio da \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorato notice da !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorato notice da \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5602,9 +5602,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Spam Notice da !n%Q [%Q@!h%Q]: %Q (parola di Spam corrispondente "
+"Spam Notice da \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (parola di Spam corrispondente "
 "\"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5613,29 +5613,29 @@ msgstr ""
 "Ricevuto messaggio di Topic per un canale sconosciuto, possibile asincronia"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] ha cambiato il Topic in \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha cambiato il Topic in \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] ha cambiato nickname in !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ha cambiato nickname in \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Il destinatario di questa Query era stato perso; è stato trovato quando !n"
-"%Q [%Q@!h%Q] ha cambiato il suo nickname in !n%Q"
+"Il destinatario di questa Query era stato perso; è stato trovato quando \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r] ha cambiato il suo nickname in \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Il recente cambio di nickname da !n%Q a !n%Q ha causato un "
+"Il recente cambio di nickname da \r!n\r%Q\r a \r!n\r%Q\r ha causato un "
 "conflitto tra le Query: unifico l'Output"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5643,8 +5643,8 @@ msgid "End of merged output"
 msgstr "Fine dell'Output unificato"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Ignorato invito da !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ignorato invito da \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5655,8 +5655,8 @@ msgid "double-click the channel name to join"
 msgstr "doppio click sul nome del Canale per entrare"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] ti invita nel Canale !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ti invita nel Canale \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5664,8 +5664,8 @@ msgstr ""
 "Ricevuto un messaggio di Invito diretto a qualcun'altro, possibile asincronia"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS da !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS da \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5678,33 +5678,37 @@ msgstr ""
 "Ricevuto cambio di modo per un Canale sconosciuto, possibile asincronia"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] ha impostato la Chiave del Canale in \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr ""
+"%Q [%Q@%Q] ha impostato la Chiave del Canale in \"\n"
+"!m-k\n"
+"%Q\n"
+"\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] ha rimosso la Chiave al Canale"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] ha impostato il !m-llimite del Canale a %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] ha impostato il \r!m-l\rlimite del Canale a %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] ha rimosso il Limite del Canale"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] ha impostato il modo %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] ha impostato il modo %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] ha impostato il !m%c%cmodo del Canale in %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] ha impostato il \r!m%c%c\rmodo del Canale in %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] ha impostato il modo %c%c a !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] ha impostato il modo %c%c a \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5771,12 +5775,12 @@ msgid "This server supports: %s"
 msgstr "Il Server supporta: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Fine dei Nomi per !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Fine dei Nomi per \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Nomi per !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Nomi per \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5787,16 +5791,16 @@ msgid "Channel topic is: %Q"
 msgstr "Il Topic del canale è %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Il Topic per !c%Q è: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Il Topic per \r!c\r%Q\r è: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Nessun Topic impostato"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Nessun Topic impostato per il canale !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Nessun Topic impostato per il canale \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5807,20 +5811,20 @@ msgid "Topic was set by %Q"
 msgstr "Il Topic è stato impostato da %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Il Topic per !c%Q è stato impostato da %Q il %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Il Topic per \r!c\r%Q\r è stato impostato da %Q il %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Il Topic per !c%Q è stato impostato da %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Il Topic per \r!c\r%Q\r è stato impostato da %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Il modo per il canale !c%Q è %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Il modo per il canale \r!c\r%Q\r è %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Modo utente per !n%Q è %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Modo utente per \r!n\r%Q\r è %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5829,8 +5833,8 @@ msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Fine del canale %Q per !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Fine del canale %Q per \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5845,8 +5849,8 @@ msgid "ban exception list"
 msgstr "lista eccezioni Ban"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q per !c%Q: !m-%c%Q (impostato da %Q su %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q per \r!c\r%Q\r: \r!m-%c\r%Q\r (impostato da %Q su %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5862,12 +5866,12 @@ msgstr "Lista eccezioni Ban"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Voce WHO per %c!n%Q%c [%Q@!h%Q]: %cCanale%c: !c%Q, %cServer"
-"%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAssente%c: %Q, %cNome Vero%c: "
+"Voce WHO per %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cCanale%c: \r!c\r%Q\r, %cServer"
+"%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAssente%c: %Q, %cNome Vero%c: "
 "%Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5891,8 +5895,8 @@ msgstr ""
 "inviare il nickname manualmente"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Impossibile entrare come '!n%Q' (%d: %Q), provo '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Impossibile entrare come '\r!n\r%Q\r' (%d: %Q), provo '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5911,28 +5915,28 @@ msgid "End of help about %Q"
 msgstr "Fine dell'aiuto per %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c è assente: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c è assente: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c è %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c è %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "Nome vero per %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "Nome vero per %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c era %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c era %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c aveva come nome vero: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c aveva come nome vero: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c è nei canali: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c è nei canali: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
@@ -5941,32 +5945,32 @@ msgstr ""
 "inattività "
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "Il tempo di inattività  di %c!n%Q%c: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "Il tempo di inattività  di %c\r!n\r%Q\r%c: %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "Orario di accesso di %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "Orario di accesso di %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "Il server di %c!n%Q%c: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "Il server di %c\r!n\r%Q\r%c: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c è autenticato come: %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\\r!n\\r%Q\\r%c è autenticato come: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "Informazioni su %c!n%Q%c: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "Informazioni su %c\r!n\r%Q\r%c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "Informazioni WHOIS per %c!n%Q%c ricevute da !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "Informazioni WHOIS per %c\r!n\r%Q\r%c ricevute da \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "Informazioni WHOWAS per %c!n%Q%c ricevute da !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "Informazioni WHOWAS per %c\r!n\r%Q\r%c ricevute da \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -5977,8 +5981,8 @@ msgid "Channel was created at %Q"
 msgstr "Il canale è stato creato il %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Il canale !c%Q è stato creato %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Il canale \r!c\r%Q\r è stato creato %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6026,37 +6030,37 @@ msgstr "Imposto il nickname per l'Away (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "Le informazioni su %c!s%s%c sono: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "Le informazioni su %c\r!s\r%s\r%c sono: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "L'Amministratore di %c!s%s%c è: %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "L'Amministratore di %c\r!s\r%s\r%c è: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "L'indirizzo di %c!s%s%c è %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "L'indirizzo di %c\r!s\r%s\r%c è %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q invita %Q nel canale %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r invita %Q nel canale %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "Informazioni per %c!s%s%c:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "Informazioni per %c\r!s\r%s\r%c:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Fine delle informazioni per %c!s%s%c"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Fine delle informazioni per %c\r!s\r%s\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "L'ora su %c!s%s%c è: %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "L'ora su %c\r!s\r%s\r%c è: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6088,8 +6092,8 @@ msgid "Your encoding is now %Q"
 msgstr "La tua codifica adesso è %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "La codifica di %c!n%Q%c è %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "La codifica di %c\r!n\r%Q\r%c è %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7331,19 +7335,19 @@ msgstr "Canali in comune: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Il destinarario di questa query è cambiato da !n%Q [%Q@!h%Q] a "
-"!n%Q [%Q@!h%Q]"
+"Il destinarario di questa query è cambiato da \r!n\r%Q\r [%Q@\r!h\r%Q\r] a "
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Canali in comune con !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Canali in comune con \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Nessun Canale in comune per !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Nessun Canale in comune per \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/kvirc.pot b/translations/messages/kvirc/kvirc.pot
index e2f4e2af..bd6b290b 100644
--- a/translations/messages/kvirc/kvirc.pot
+++ b/translations/messages/kvirc/kvirc.pot
@@ -2558,7 +2558,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -2571,7 +2571,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
 
@@ -2603,7 +2603,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
 
@@ -2645,7 +2645,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -2665,7 +2665,7 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2673,7 +2673,7 @@ msgid "watch"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -4950,12 +4950,12 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -4968,7 +4968,7 @@ msgid "Channel CTCP"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -4977,7 +4977,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
 
@@ -4994,7 +4994,7 @@ msgid "replied"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5009,7 +5009,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5017,7 +5017,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5078,11 +5078,11 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5095,12 +5095,12 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
@@ -5117,15 +5117,15 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5133,27 +5133,27 @@ msgid "Received a part message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
@@ -5163,7 +5163,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
@@ -5172,23 +5172,23 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
@@ -5198,20 +5198,20 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5228,7 +5228,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5236,24 +5236,24 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5262,7 +5262,7 @@ msgid "End of merged output"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5274,7 +5274,7 @@ msgid "double-click the channel name to join"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
@@ -5282,7 +5282,7 @@ msgid "Received an invite message directed to another nick, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
@@ -5295,7 +5295,7 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
@@ -5303,7 +5303,7 @@ msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
@@ -5311,16 +5311,16 @@ msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
@@ -5377,11 +5377,11 @@ msgid "This server supports: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -5393,7 +5393,7 @@ msgid "Channel topic is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -5401,7 +5401,7 @@ msgid "No channel topic is set"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -5413,19 +5413,19 @@ msgid "Topic was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -5435,7 +5435,7 @@ msgid "(Unknown)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5451,7 +5451,7 @@ msgid "ban exception list"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
@@ -5468,8 +5468,8 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
 
@@ -5490,7 +5490,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5510,27 +5510,27 @@ msgid "End of help about %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -5538,31 +5538,31 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -5574,7 +5574,7 @@ msgid "Channel was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -5623,36 +5623,36 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -5685,7 +5685,7 @@ msgid "Your encoding is now %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -6898,16 +6898,16 @@ msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:424
diff --git a/translations/messages/kvirc/nl.po b/translations/messages/kvirc/nl.po
index ee6d912c..9b51b309 100644
--- a/translations/messages/kvirc/nl.po
+++ b/translations/messages/kvirc/nl.po
@@ -2815,7 +2815,7 @@ msgstr "s s s masker of is"
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 #, fuzzy
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -2831,7 +2831,7 @@ msgstr "Notificatie geregistreerd gebruiker gewijzigd"
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 #, fuzzy
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr "Notificatie naar s de woordenboek."
 
@@ -2867,7 +2867,7 @@ msgstr "Notificatie de s"
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 #, fuzzy
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr "Notificatie s de"
 
@@ -2914,7 +2914,7 @@ msgstr "s s s masker of door de"
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 #, fuzzy
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -2938,7 +2938,7 @@ msgstr "Verwijderen"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
 #, fuzzy
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr "Notificatie voor s"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2948,7 +2948,7 @@ msgstr "Pad"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
 #, fuzzy
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr "Notificatie s is"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -5498,12 +5498,12 @@ msgstr "module s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, fuzzy, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, fuzzy, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -5518,7 +5518,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
 #, fuzzy
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "s s s s s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -5529,7 +5529,7 @@ msgstr "s"
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 #, fuzzy
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr "s s s s s s genegeerd"
 
@@ -5549,7 +5549,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
 #, fuzzy
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr "s s s s s s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5566,7 +5566,7 @@ msgstr "tijd s de"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
 #, fuzzy
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr "s s s s seconden"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5576,7 +5576,7 @@ msgstr "s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
 #, fuzzy
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "s s s naar onbekend s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5649,12 +5649,12 @@ msgstr "Nee de gebruiker de"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
 #, fuzzy
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr "s s s s s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
 #, fuzzy
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr "s s s s s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5669,12 +5669,12 @@ msgstr "naar de de module naar"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
 #, fuzzy
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, fuzzy, c-format
-msgid "Received pong from !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
@@ -5695,17 +5695,17 @@ msgstr "voor onbekend?"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 #, fuzzy
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
 msgstr "s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr "s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5715,32 +5715,32 @@ msgstr "voor onbekend?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
 #, fuzzy
-msgid "You have left channel !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
 msgstr "U s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
 #, fuzzy
-msgid "You have left channel !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
 msgstr "U s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
@@ -5751,7 +5751,7 @@ msgstr ""
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
@@ -5762,26 +5762,26 @@ msgstr "voor onbekend?"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
 #, fuzzy
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
 #, fuzzy
-msgid "Attempting to rejoin !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
 msgstr "naar"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 #, fuzzy
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr "s s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 #, fuzzy
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "s s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
@@ -5793,23 +5793,23 @@ msgstr "de naar it"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
 #, fuzzy
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 #, fuzzy
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr "s s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
 #, fuzzy
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
 #, fuzzy
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5828,7 +5828,7 @@ msgstr "commando naar it de"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 #, fuzzy
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr "s s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5838,25 +5838,25 @@ msgstr "voor onbekend?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
 msgstr "s s s naar s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
 msgstr "s s s is"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5866,7 +5866,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
 #, fuzzy
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5879,7 +5879,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr "s s s is aan"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
@@ -5889,7 +5889,7 @@ msgstr "voor onbekend?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
 #, fuzzy
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "U s door s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
@@ -5904,7 +5904,7 @@ msgstr "voor onbekend?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
 #, fuzzy
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
 msgstr "s s s naar s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
@@ -5914,7 +5914,7 @@ msgstr "s s s de"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
 #, fuzzy
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
 msgstr "s s s naar s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
@@ -5924,18 +5924,18 @@ msgstr "s s s de"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
 #, fuzzy
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
 #, fuzzy
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
 msgstr "s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
 #, fuzzy
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
 msgstr "s s s s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
@@ -6007,12 +6007,12 @@ msgstr "Server"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
 #, fuzzy
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr "End voor"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
 #, fuzzy
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr "voor s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -6027,7 +6027,7 @@ msgstr "is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
 #, fuzzy
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr "voor s is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -6037,7 +6037,7 @@ msgstr "Nee is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
 #, fuzzy
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr "Nee is voor"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -6052,22 +6052,22 @@ msgstr "door"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr "voor s door s aan"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr "voor s is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
 #, fuzzy
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr "voor s is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
 #, fuzzy
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr "voor s is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -6079,7 +6079,7 @@ msgstr "Onbekend"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
 #, fuzzy
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr "End voor"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -6099,7 +6099,7 @@ msgstr "Actief"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
 #, fuzzy
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
 msgstr "voor s s door s aan s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
@@ -6120,8 +6120,8 @@ msgstr "Actief"
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 #, fuzzy
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr "voor s s s s s s s naam"
 
@@ -6144,7 +6144,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
 #, fuzzy
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr "Nee naar login s s s."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -6168,32 +6168,32 @@ msgstr "End voor"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
 #, fuzzy
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr "s is"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
 #, fuzzy
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr "s is s s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
 #, fuzzy
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr "s s naam"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
 #, fuzzy
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr "s is s s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
 #, fuzzy
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr "s s naam"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
 #, fuzzy
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -6203,37 +6203,37 @@ msgstr "de idle"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
 #, fuzzy
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr "s s idle tijd"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
 #, fuzzy
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr "s s tijd"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
 #, fuzzy
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr "s s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
 #, fuzzy
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr "s s naam"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
 #, fuzzy
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
 #, fuzzy
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr "s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
 #, fuzzy
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr "s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -6248,7 +6248,7 @@ msgstr "s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
 #, fuzzy
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr "s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -6302,38 +6302,38 @@ msgstr "Server s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, fuzzy, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, fuzzy, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, fuzzy, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
 #, fuzzy
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr "s s s is aan"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, fuzzy, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
 #, fuzzy
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -6373,7 +6373,7 @@ msgstr "U gebruiker"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
 #, fuzzy
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr "s s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -7774,18 +7774,18 @@ msgstr "is"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:385
 #, fuzzy
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "U s door s s s"
 
 #: src/kvirc/ui/kvi_query.cpp:388
 #, fuzzy
-msgid "No common channels for !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr "U s door s s s"
 
 #: src/kvirc/ui/kvi_query.cpp:424
diff --git a/translations/messages/kvirc/pl.po b/translations/messages/kvirc/pl.po
index 78a4c1a8..bcbb502d 100644
--- a/translations/messages/kvirc/pl.po
+++ b/translations/messages/kvirc/pl.po
@@ -2683,7 +2683,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
@@ -2696,7 +2696,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
 
@@ -2728,7 +2728,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
 
@@ -2770,7 +2770,7 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
@@ -2790,7 +2790,7 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2798,7 +2798,7 @@ msgid "watch"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
@@ -5214,12 +5214,12 @@ msgstr "Wyładowano moduł '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, fuzzy, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, fuzzy, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -5233,7 +5233,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
 #, fuzzy
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -5242,7 +5242,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
 
@@ -5259,7 +5259,7 @@ msgid "replied"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5274,7 +5274,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5282,7 +5282,7 @@ msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5344,11 +5344,11 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5361,12 +5361,12 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
@@ -5384,15 +5384,15 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5400,27 +5400,27 @@ msgid "Received a part message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
@@ -5430,7 +5430,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
@@ -5439,23 +5439,23 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
@@ -5466,22 +5466,22 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
 #, fuzzy
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
 #, fuzzy
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
 #, fuzzy
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5498,7 +5498,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5506,24 +5506,24 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5533,7 +5533,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
 #, fuzzy
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5545,7 +5545,7 @@ msgid "double-click the channel name to join"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
@@ -5553,7 +5553,7 @@ msgid "Received an invite message directed to another nick, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
@@ -5566,7 +5566,7 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
@@ -5574,7 +5574,7 @@ msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
@@ -5582,16 +5582,16 @@ msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
@@ -5649,12 +5649,12 @@ msgid "This server supports: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
 #, fuzzy
-msgid "Names for !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
@@ -5669,7 +5669,7 @@ msgstr "Anuluj"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
 #, fuzzy
-msgid "Topic for !c%Q is: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
@@ -5678,7 +5678,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
 #, fuzzy
-msgid "No topic is set for channel !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
 msgstr "Brak wartości do wstawienia"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
@@ -5693,22 +5693,22 @@ msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q on %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
 #, fuzzy
-msgid "Channel mode for !c%Q is %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
 #, fuzzy
-msgid "User mode for !n%Q is %s"
+msgid "User mode for \r!n\r%Q\r is %s"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
@@ -5719,7 +5719,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
 #, fuzzy
-msgid "End of channel %Q for !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
@@ -5736,7 +5736,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
 #, fuzzy
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
@@ -5754,8 +5754,8 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
 
@@ -5776,7 +5776,7 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
@@ -5799,27 +5799,27 @@ msgid "End of help about %Q"
 msgstr "Nieprawidłowy indeks (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
@@ -5827,31 +5827,31 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -5863,7 +5863,7 @@ msgid "Channel was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
@@ -5913,36 +5913,36 @@ msgstr "Znajdowanie hosta %Q..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
+msgid "%c\r!s\r%s\r%c's information:"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
@@ -5978,7 +5978,7 @@ msgid "Your encoding is now %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
@@ -7301,16 +7301,16 @@ msgstr "Ostatnie &kanały"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:424
diff --git a/translations/messages/kvirc/pt.po b/translations/messages/kvirc/pt.po
index 7fda1d23..2ec7643f 100644
--- a/translations/messages/kvirc/pt.po
+++ b/translations/messages/kvirc/pt.po
@@ -2649,12 +2649,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Lista de notificação: !n%Q parece estar ligado, mas a máscara [%Q@!h"
-"%Q] não corresponde (a máscara de registo não corresponde, ou a alcunha "
+"Lista de notificação: \r!n\r%Q\r parece estar ligado, mas a máscara [%Q@\r!h"
+"\r%Q\r] não corresponde (a máscara de registo não corresponde, ou a alcunha "
 "está a ser usada por outra pessoa)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2667,10 +2667,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Lista de notificação: inesperada inconsistência, esperava-se !n%Q na "
+"Lista de notificação: inesperada inconsistência, esperava-se \r!n\r%Q\r na "
 "Base de Dados do utilizador registado"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2706,10 +2706,10 @@ msgstr "Lista de notificação: resposta USERHOST danificado do servidor? (%s)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Lista de notificação: !n%Q parece ter-se desligado antes da resposta "
+"Lista de notificação: \r!n\r%Q\r parece ter-se desligado antes da resposta "
 "USERHOST, será verificado no próximo passo"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2752,12 +2752,12 @@ msgstr "máscara de registo modificada ou 'desync' com o serviço vigiar"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Lista de notificação: !n%Q parece estar ligado, mas a máscara [%Q@!h"
-"%Q] não corresponde (vigiar: a máscara de registo não corresponde, ou a "
+"Lista de notificação: \r!n\r%Q\r parece estar ligado, mas a máscara [%Q@\r!h"
+"\r%Q\r] não corresponde (vigiar: a máscara de registo não corresponde, ou a "
 "alcunha está a ser usada por outra pessoa)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2777,16 +2777,16 @@ msgid "removed from watch list"
 msgstr "removido da lista de vigiar"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Lista de notificação: Parou de vigiar para !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Lista de notificação: Parou de vigiar para \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "vigiar"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Lista de notificação: !n%Q está desligado (vigiar)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Lista de notificação: \r!n\r%Q\r está desligado (vigiar)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5261,13 +5261,13 @@ msgstr "Módulo descarregado '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "A ignorar DCC de !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "A ignorar DCC de \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "A ignorar CTCP de !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "A ignorar CTCP de \r!nc\r%s\r [%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5279,8 +5279,8 @@ msgid "Channel CTCP"
 msgstr "Canal CTCP"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q resposta de !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q resposta de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5288,10 +5288,10 @@ msgstr "O seguinte pedido CTCP não tem um alvo reconhecido %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c pedido de !n%Q [%Q@!h%Q] (%Q), ignorado (limite de flood "
+"%Q %Q%c pedido de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignorado (limite de flood "
 "excedido)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5307,8 +5307,8 @@ msgid "replied"
 msgstr "respondido"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c pedido de !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c pedido de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5324,16 +5324,16 @@ msgstr ""
 "\", não confiar na hora indicada"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
-msgstr "%Q resposta PING de !n%Q [%Q@!h%Q]: %u seg %u mseg"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
+msgstr "%Q resposta PING de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u seg %u mseg"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "A seguinte CTCP ACTION não tem um alvo reconhecido %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION de !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5405,12 +5405,12 @@ msgstr ""
 "alteração"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "A ignorar o pedido DCC %S de !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "A ignorar o pedido DCC %S de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "A processar o pedido DCC %Q de !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "A processar o pedido DCC %Q de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5426,13 +5426,13 @@ msgstr ""
 "danificado"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "PING recebido de !s%Q (PING %Q), pong respondido"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "PING recebido de \r!s\r%Q\r (PING %Q), pong respondido"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "PONG recebido de !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "PONG recebido de \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5449,18 +5449,18 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] entrou no !c%Q [alteração implícita umode +"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] entrou no \r!c\r%Q\r [alteração implícita umode +"
 "%c]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] entrou no !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] entrou no \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] acabou de entrar no !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] acabou de entrar no \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5469,28 +5469,28 @@ msgstr ""
 "desync"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Acabou de sair do canal !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Acabou de sair do canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Acabou de sair do canal !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Acabou de sair do canal \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] saiu do !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] saiu do \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] saiu do !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] saiu do \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!nc%Q [%Q@!h%Q] acabou de sair do !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] acabou de sair do \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!nc%Q [%Q@!h%Q] acabou de sair do !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] acabou de sair do \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5499,8 +5499,8 @@ msgstr "Netsplit detectado :%s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] saiu do IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] saiu do IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5509,28 +5509,28 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Foi expulso de !c%Q por !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Foi expulso de \r!c\r%Q\r por \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "A tentar reentrar em !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "A tentar reentrar em \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] foi expulso de !c%Q por !n%Q [%Q@!h"
-"%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] foi expulso de \r!c\r%Q\r por \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] acabou de ser expulso de !c%Q por !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] acabou de ser expulso de \r!c\r%Q\r por \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5541,23 +5541,23 @@ msgstr ""
 "falhou ao descodifica-la: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "A ignorar privados PRIVMSG de !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "A ignorar privados PRIVMSG de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Lixo privmsg de !n%Q [%Q@!h%Q]: %Q (palavra lixo correspondente  "
+"Lixo privmsg de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (palavra lixo correspondente  "
 "\"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "A ignorar PRIVMSG no canal de !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "A ignorar PRIVMSG no canal de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "A ignorar Notícia de !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "A ignorar Notícia de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5575,9 +5575,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Noticia lixo de !n%Q [%Q@!h%Q]: %Q (palavra lixo correspondente "
+"Noticia lixo de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (palavra lixo correspondente "
 "\"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5586,29 +5586,29 @@ msgstr ""
 "Mensagem de tópico recebida para um canal desconhecido, possível desync"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] mudou o tópico para \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] mudou o tópico para \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] é agora conhecido como !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] é agora conhecido como \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"O alvo deste query perdeu-se e foi encontrado quando o !n%Q [%Q@!h"
-"%Q] mudou a sua alcunha para !n%Q"
+"O alvo deste query perdeu-se e foi encontrado quando o \r!n\r%Q\r [%Q@\r!h\r"
+"%Q\r] mudou a sua alcunha para \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"A recente mudança de alcunha de !n%Q para !n%Q causou uma "
+"A recente mudança de alcunha de \r!n\r%Q\r para \r!n\r%Q\r causou uma "
 "colisão de privados: a juntar o resultado"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5616,8 +5616,8 @@ msgid "End of merged output"
 msgstr "Fim do resultado junto"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "A ignorar convite de !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "A ignorar convite de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5628,8 +5628,8 @@ msgid "double-click the channel name to join"
 msgstr "duplo click no nome do canal para entrar"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] convida-o a entra no canal !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] convida-o a entra no canal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5638,8 +5638,8 @@ msgstr ""
 "desync"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS de !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5651,33 +5651,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Mudança de modo recebida para um canal desconhecido, possível desync"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] definiu a senha o canal para \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] definiu a senha o canal para \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] removeu a senha do canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] definiu o limite do canal !m-lpara %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] definiu o limite do canal \r!m-l\rpara %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] removeu limite do canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] colocou o modo %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] colocou o modo %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] colocou o canal em !m%c%cmodo %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] colocou o canal em \r!m%c%c\rmodo %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] colocou o modo %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] colocou o modo %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5745,12 +5745,12 @@ msgid "This server supports: %s"
 msgstr "Este servidor suporta: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Fim de NAMES para !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Fim de NAMES para \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Nomes para !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Nomes para \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5761,16 +5761,16 @@ msgid "Channel topic is: %Q"
 msgstr "O tópico do canal é: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Tópico para !c%Q é: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Tópico para \r!c\r%Q\r é: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Nenhum tópico de canal posto"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Nenhum tópico posto para o canal !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Nenhum tópico posto para o canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5781,20 +5781,20 @@ msgid "Topic was set by %Q"
 msgstr "Tópico posto por %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "O tópico para !c%Q foi posto por %Q em %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "O tópico para \r!c\r%Q\r foi posto por %Q em %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "O tópico para !c%Q foi posto por %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "O tópico para \r!c\r%Q\r foi posto por %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Modo de canal para !c%Q é %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Modo de canal para \r!c\r%Q\r é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Modo de utilizador para !c%Q é %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Modo de utilizador para \r!c\r%Q\r é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5803,8 +5803,8 @@ msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Fim do canal %Q para !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Fim do canal %Q para \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5819,8 +5819,8 @@ msgid "ban exception list"
 msgstr "lista de excepções de banimentos"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q para !c%Q: !m-%c%Q (posto por %Q em %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q para \r!c\r%Q\r: \r!m-%c\r%Q\r (posto por %Q em %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5836,12 +5836,12 @@ msgstr "Listagem de excepções de banimentos"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Entrada WHO para %c!n%Q%c [%Q@!h%Q]: %cCanal%c: !c%Q, "
-"%cServidor%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAusente%c: %Q, "
+"Entrada WHO para %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cCanal%c: \r!c\r%Q\r, "
+"%cServidor%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAusente%c: %Q, "
 "%cNome Real %c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5865,8 +5865,8 @@ msgstr ""
 "tem que enviar o apelido manualmente"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Não é possível entrar como '!n%Q' (%d: %Q), tentar '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Não é possível entrar como '\r!n\r%Q\r' (%d: %Q), tentar '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5885,28 +5885,28 @@ msgid "End of help about %Q"
 msgstr "Fim da ajuda acerca de %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c ausente: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c ausente: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c é %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c é %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c nome real: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c nome real: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c era %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c era %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c nome real era: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c nome real era: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c canais: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c canais: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
@@ -5914,32 +5914,32 @@ msgstr ""
 "Resposta RPL_WHOISIDLE falhada, não é possível calcular o tempo inactivo"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c tempo inactivo: %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c tempo inactivo: %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c data de entrada: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c data de entrada: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c servidor: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c servidor: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c está autenticado como %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c está autenticado como %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c informação: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c informação: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c informação WHOIS de !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c informação WHOIS de \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c info WHOWAS desde !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c info WHOWAS desde \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -5950,8 +5950,8 @@ msgid "Channel was created at %Q"
 msgstr "Canal criado em %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Canal !c%Q foi criado em %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Canal \r!c\r%Q\r foi criado em %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -5999,37 +5999,37 @@ msgstr "A definir alcunha de ausência (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "Informação do servidor %c!s%s%c: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "Informação do servidor %c\r!s\r%s\r%c: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "O administrador de %c!s%s%c é %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "O administrador de %c\r!s\r%s\r%c é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "O endereço de contacto de %c!s%s%c é %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "O endereço de contacto de %c\r!s\r%s\r%c é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q convidou %Q para o canal %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r convidou %Q para o canal %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "Informação de %c!s%s%c:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "Informação de %c\r!s\r%s\r%c:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Fim da informação de %c!s%s%c"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Fim da informação de %c\r!s\r%s\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%so tempo de %c é %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\ro tempo de %c é %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6061,8 +6061,8 @@ msgid "Your encoding is now %Q"
 msgstr "A sua codificação agora é %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Qo código de página de %c é %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\ro código de página de %c é %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7301,19 +7301,19 @@ msgstr "Canais comuns: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"O alvo deste privado foi alterado desde !n%Q [%Q@!h%Q] para !n"
-"%Q [%Q@!h%Q]"
+"O alvo deste privado foi alterado desde \r!n\r%Q\r [%Q@\r!h\r%Q\r] para \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Canais em comum com !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Canais em comum com \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Nenhum canal em comum com !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Nenhum canal em comum com \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/pt_BR.po b/translations/messages/kvirc/pt_BR.po
index 610a72fc..06e8ebe3 100644
--- a/translations/messages/kvirc/pt_BR.po
+++ b/translations/messages/kvirc/pt_BR.po
@@ -2664,12 +2664,12 @@ msgstr "máscara de registro alterada, ou apelido está sendo usado por alguém"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Lista de notificações: !n%Q parece estar online, mas a máscara [%Q@!"
-"h%Q] não corresponde (a máscara de registro não corresponde ou o apelido "
+"Lista de notificações: \r!n\r%Q\r parece estar online, mas a máscara [%Q@\r!"
+"h\r%Q\r] não corresponde (a máscara de registro não corresponde ou o apelido "
 "está sendo usado por outra pessoa)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2682,11 +2682,11 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Lista de notificações: inconsistência inesperada; era esperado encontrar !"
-"n%Q na banco de dados de usuários registrados"
+"Lista de notificações: inconsistência inesperada; era esperado encontrar \r!"
+"n\r%Q\r na banco de dados de usuários registrados"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
 #, c-format
@@ -2722,10 +2722,10 @@ msgstr "Lista de notificação: resposta USERHOST do servidor esta quebrada? (%s
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Lista de notificação: parece que !n%Q ficou offline antes da resposta "
+"Lista de notificação: parece que \r!n\r%Q\r ficou offline antes da resposta "
 "USERHOST, será verificado no próximo passo"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2768,12 +2768,12 @@ msgstr "máscara de registro alterada ou se dessincronizou com o serviço watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Lista de notificações: !n%Q parece estar online, mas a máscara [%Q@!"
-"h%Q] não corresponde (watch: a máscara de registro não corresponde ou o "
+"Lista de notificações: \r!n\r%Q\r parece estar online, mas a máscara [%Q@\r!"
+"h\r%Q\r] não corresponde (watch: a máscara de registro não corresponde ou o "
 "apelido está sendo usado por outra pessoa)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2793,7 +2793,7 @@ msgid "removed from watch list"
 msgstr "removido da lista watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
@@ -2801,8 +2801,8 @@ msgid "watch"
 msgstr "watch"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Lista de notificação: !n%Q está desconectado (watch)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Lista de notificação: \r!n\r%Q\r está desconectado (watch)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5271,13 +5271,13 @@ msgstr "Módulo descarregado '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Ignorando DCC de!nc%s[%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorando DCC de\r!nc\r%s\r[%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Ignorando CTCP de!nc%s[%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Ignorando CTCP de\r!nc\r%s\r[%s@\r!h\r%s\r]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5289,8 +5289,8 @@ msgid "Channel CTCP"
 msgstr "CTCP de canal"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "Resposta %Q %Q de !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Resposta %Q %Q de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5298,10 +5298,10 @@ msgstr "O seguinte pedido CTCP não tem um destino reconhecido %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c solicitação de!n%Q[%Q@!h%Q] (%Q), ignorado (limite de "
+"%Q %Q%c solicitação de\r!n\r%Q\r[%Q@\r!h\r%Q\r] (%Q), ignorado (limite de "
 "inundação excedido)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5317,8 +5317,8 @@ msgid "replied"
 msgstr "respondido"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c solicitação de!n%Q[%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c solicitação de\r!n\r%Q\r[%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5334,16 +5334,16 @@ msgstr ""
 "não confie no tempo exibido"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
-msgstr "%Q resposta PING de !n%Q [%Q@!h%Q]: %u seg %u mseg"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
+msgstr "%Q resposta PING de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u seg %u mseg"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "A seguinte CTCP ACTION não tem um destino reconhecido %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION de !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5412,12 +5412,12 @@ msgstr ""
 ": Não existe tal apelido na banco de dados de usuários, ignorando a mudança"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Ignorando solicitação DCC %S de !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Ignorando solicitação DCC %S de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "Processando o pedido DCC %Q de !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "Processando o pedido DCC %Q de \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5432,13 +5432,13 @@ msgstr ""
 "Impossível processar o pedido anterior: o módulo DCC pode estar quebrado"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Ping recebido de!s%Q(PING %Q), respondeu pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Ping recebido de\r!s\r%Q\r(PING %Q), respondeu pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Pong recebido de !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Pong recebido de \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5456,15 +5456,15 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
@@ -5474,27 +5474,27 @@ msgstr ""
 "dessincronização"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Acabou de sair do canal !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Acabou de sair do canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Acabou de sair do canal !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Acabou de sair do canal \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] saiu do !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] saiu do \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] acabou de sair do !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] acabou de sair do \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
@@ -5504,8 +5504,8 @@ msgstr "Netsplit detectado: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] saiu do irc %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] saiu do irc %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5515,28 +5515,28 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Você foi chutado de !c%Q por !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Você foi chutado de \r!c\r%Q\r por \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Tentando reentrar em !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Tentando reentrar em \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] foi chutadado de !c%Q by !n%Q [%Q@!h"
-"%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] foi chutadado de \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] acabou de ser kickado de !c%Q por !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] acabou de ser kickado de \r!c\r%Q\r por \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5547,24 +5547,24 @@ msgstr ""
 "criptografia não conseguiu decodificá-la: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"Ignorando PRIVMSG de conversa privada de !nc%Q [%Q@!h%Q]: %Q"
+"Ignorando PRIVMSG de conversa privada de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Spam privmsg de !n%Q [%Q@!h%Q]: %Q (palavra spam coincidente \"%s"
+"Spam privmsg de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (palavra spam coincidente \"%s"
 "\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorando PRIVMSG de canal de !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorando PRIVMSG de canal de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Ignorando NOTICE de !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Ignorando NOTICE de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5582,9 +5582,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Aviso de spam de !n%Q [%Q@!h%Q]: %Q (corresponde à palavra de "
+"Aviso de spam de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (corresponde à palavra de "
 "spam \"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5594,29 +5594,29 @@ msgstr ""
 "dessincronização"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] mudou o tópico para \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] mudou o tópico para \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] é agora conhecido como !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] é agora conhecido como \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"O destino deste query se perdeu e foi encontrado quando !n%Q [%Q@!h"
-"%Q] aletrou seu apelido para !n%Q"
+"O destino deste query se perdeu e foi encontrado quando \r!n\r%Q\r [%Q@\r!h\r"
+"%Q\r] aletrou seu apelido para \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"A mudança recente de apelido de !n%Q para !n%Q causou uma "
+"A mudança recente de apelido de \r!n\r%Q\r para \r!n\r%Q\r causou uma "
 "colisãode query: mesclando a saída"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5624,8 +5624,8 @@ msgid "End of merged output"
 msgstr "Final de saída mesclada"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Ignorando convite de !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Ignorando convite de \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5636,8 +5636,8 @@ msgid "double-click the channel name to join"
 msgstr "clique duas vezes no nome do canal para entrar"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] convidou você para o canal !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] convidou você para o canal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5646,8 +5646,8 @@ msgstr ""
 "dessincronização"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS de !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS de \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5661,33 +5661,33 @@ msgstr ""
 "dessincronização"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] definiu a chave do canal como \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] definiu a chave do canal como \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] removeu a senha do canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] colocou o limite do canal !m-lpara %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] colocou o limite do canal \r!m-l\rpara %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] removeu limite do canal"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] colocou o modo %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] colocou o modo %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] colocou o canal !m%c%cmodo %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] colocou o canal \r!m%c%c\rmodo %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] colocou o modo %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] colocou o modo %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5756,12 +5756,12 @@ msgid "This server supports: %s"
 msgstr "Este servidor suporta: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Fim de NAMES para !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Fim de NAMES para \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Nomes para !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Nomes para \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5772,16 +5772,16 @@ msgid "Channel topic is: %Q"
 msgstr "O tópico do canal é: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Tópico para !c%Q é: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Tópico para \r!c\r%Q\r é: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "O canal não possui um tópico"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Nenhum tópico posto para o canal !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Nenhum tópico posto para o canal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5792,20 +5792,20 @@ msgid "Topic was set by %Q"
 msgstr "O tópico foi definido por %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "O tópico de !c%Q foi definido por %Q em %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "O tópico de \r!c\r%Q\r foi definido por %Q em %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "O tópico de !c%Q foi definido por %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "O tópico de \r!c\r%Q\r foi definido por %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Modo de canal para !c%Q é %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Modo de canal para \r!c\r%Q\r é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "O modo de usuário de !n%Q é %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "O modo de usuário de \r!n\r%Q\r é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5814,8 +5814,8 @@ msgid "(Unknown)"
 msgstr "(desconhecido)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Fim do canal %Q para !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Fim do canal %Q para \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5830,8 +5830,8 @@ msgid "ban exception list"
 msgstr "lista de exceções de bans"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q para !c%Q: !m-%c%Q (posto por %Q em %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q para \r!c\r%Q\r: \r!m-%c\r%Q\r (posto por %Q em %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5847,12 +5847,12 @@ msgstr "Listagem de excepções de bans"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Entrada WHO para %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cNome "
+"Entrada WHO para %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cNome "
 "real %c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5876,9 +5876,9 @@ msgstr ""
 "deverá enviar o apelido manualmente"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
 msgstr ""
-"Não há meio de fazer login como '!n%Q' (%d: %Q), tentando '%Q'..."
+"Não há meio de fazer login como '\r!n\r%Q\r' (%d: %Q), tentando '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5897,28 +5897,28 @@ msgid "End of help about %Q"
 msgstr "Fim da ajuda sobre %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c está ausente: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c está ausente: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c é %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c é %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "Nome real de %c!n%Q%c : %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "Nome real de %c\r!n\r%Q\r%c : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c era %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c era %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "Nome real de %c!n%Q%c era: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "Nome real de %c\r!n\r%Q\r%c era: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c está nos canais: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c está nos canais: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
@@ -5927,31 +5927,31 @@ msgstr ""
 "inativo"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "Tempo inativo de %c!n%Q%c : %ud %uh %um %us"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "Tempo inativo de %c\r!n\r%Q\r%c : %ud %uh %um %us"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c entrou em: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c entrou em: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "Servidor em que %c!n%Q%c está: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "Servidor em que %c\r!n\r%Q\r%c está: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c está autenticado como %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c está autenticado como %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "Informações de %c!n%Q%c : %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "Informações de %c\r!n\r%Q\r%c : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
@@ -5963,8 +5963,8 @@ msgid "Channel was created at %Q"
 msgstr "Canal criado em %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Canal !c%Q foi criado em %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Canal \r!c\r%Q\r foi criado em %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6012,37 +6012,37 @@ msgstr "Definindo apelido de ausente (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "Informações do servidor de %c!s%s%c: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "Informações do servidor de %c\r!s\r%s\r%c: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "O administrador de %c!s%s%c é %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "O administrador de %c\r!s\r%s\r%c é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "O endereço de contato de %c!s%s%c é %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "O endereço de contato de %c\r!s\r%s\r%c é %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "Informações de %c!s%s%c:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "Informações de %c\r!s\r%s\r%c:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Fim das informações de %c!s%s%c"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Fim das informações de %c\r!s\r%s\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "O tempo de %c!s%s%c é %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "O tempo de %c\r!s\r%s\r%c é %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6074,8 +6074,8 @@ msgid "Your encoding is now %Q"
 msgstr "Sua codificação agora é %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "A página de códigos de %c!n%Q%c é %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "A página de códigos de %c\r!n\r%Q\r%c é %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7321,19 +7321,19 @@ msgstr "Canais comuns: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"O destino deste query foi alterado de !n%Q [%Q@!h%Q] para !n"
-"%Q [%Q@!h%Q]"
+"O destino deste query foi alterado de \r!n\r%Q\r [%Q@\r!h\r%Q\r] para \r!n\r"
+"%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Canais em comum com !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Canais em comum com \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Nenhum canal em comum com !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Nenhum canal em comum com \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/ru.po b/translations/messages/kvirc/ru.po
index b0100fbe..338ab8c5 100644
--- a/translations/messages/kvirc/ru.po
+++ b/translations/messages/kvirc/ru.po
@@ -2643,13 +2643,18 @@ msgstr "Регистрационная маска изменилась или н
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Список уведомлений:!n%Qв сети, но маска "
-"[%Q@!h%Q] не соответствует (регистрационная маска не совпадает "
-"или ник используется кем-то другим)"
+"Список уведомлений:\n"
+"!n\n"
+"%Q\n"
+"в сети, но маска [%Q@\n"
+"!h\n"
+"%Q\n"
+"] не соответствует (регистрационная маска не совпадает или ник используется "
+"кем-то другим)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
 msgid ""
@@ -2661,10 +2666,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Список уведомлений: Неожиданное противоречие, предположительно !n%Q "
+"Список уведомлений: Неожиданное противоречие, предположительно \r!n\r%Q\r "
 "зарегистрирован в базе данных пользователей"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2699,11 +2704,14 @@ msgstr "Список уведомлений: Битый ответ USERHOST от
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Список уведомлений:!n%Qушёл из сети прежде, чем был получен ответ "
-"от USERHOST, будет перепроверен в следующем цикле"
+"Список уведомлений:\n"
+"!n\n"
+"%Q\n"
+"ушёл из сети прежде, чем был получен ответ от USERHOST, будет перепроверен в "
+"следующем цикле"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
 msgid "Starting notify list"
@@ -2746,13 +2754,18 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Список уведомлений:!n%Qпоявился в онлайн, но маска "
-"[%Q@!h%Q] не соответствует (наблюдение: маска не соответствует, "
-"или ник занят кем-то другим)"
+"Список уведомлений:\n"
+"!n\n"
+"%Q\n"
+"появился в онлайн, но маска [%Q@\n"
+"!h\n"
+"%Q\n"
+"] не соответствует (наблюдение: маска не соответствует, или ник занят кем-то "
+"другим)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
 msgid ""
@@ -2771,16 +2784,20 @@ msgid "removed from watch list"
 msgstr "удалён из списка наблюдения"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Список уведомлений: Остановлено наблюдение за !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Список уведомлений: Остановлено наблюдение за \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "наблюдение"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Список уведомлений:!n%Qне в сети (наблюдение)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr ""
+"Список уведомлений:\n"
+"!n\n"
+"%Q\n"
+"не в сети (наблюдение)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5210,13 +5227,27 @@ msgstr "Выгрузка модуля '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Игнорируется DCC от !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr ""
+"Игнорируется DCC от \n"
+"!nс\n"
+"%s\n"
+" [%s@\n"
+"!h\n"
+"%s\n"
+"]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Игнорируется CTCP от !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr ""
+"Игнорируется CTCP от \n"
+"!nс\n"
+"%s\n"
+" [%s@\n"
+"!h\n"
+"%s\n"
+"]"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5228,8 +5259,8 @@ msgid "Channel CTCP"
 msgstr "CTCP в канал"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q ответ от !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q ответ от \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5237,11 +5268,16 @@ msgstr "Запрос CTCP имеет неопознанную цель %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-"%Q %Q%c запрос от !n%Q [%Q@!h%Q] (%Q), проигнорирован "
-"(превышен лимит защиты от флуда)"
+"%Q %Q%c запрос от\n"
+"!n\n"
+"%Q\n"
+"[%Q@\n"
+"!h\n"
+"%Q\n"
+"] (%Q), проигнорирован (превышен лимит защиты от флуда)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
 msgid "ignored (unrecognized)"
@@ -5256,8 +5292,8 @@ msgid "replied"
 msgstr "ответ"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c запрос от !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c запрос от \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5271,16 +5307,23 @@ msgid ""
 msgstr "Ответ PING CTCP имеет битый идентификатор времени \"%S\""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
-msgstr "%Q ответ PING от !n%Q [%Q@!h%Q]: %u с %u мс"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
+msgstr ""
+"%Q ответ PING от \n"
+"!n\n"
+"%Q\n"
+"[%Q@\n"
+"!h\n"
+"%Q\n"
+"]: %u с %u мс"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "CTCP ACTION имеет неопознанную цель %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION от !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION от \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5342,12 +5385,12 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ": Не найден ник в базе пользователей, изменения проигнорированы"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Проигнорирован DCC %S запрос от !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Проигнорирован DCC %S запрос от \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "Обработка DCC %Q запроса от !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "Обработка DCC %Q запроса от \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5360,13 +5403,13 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr "Не могу обработать поступивший запрос: Модуль DCC повреждён"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Получен пинг от !s%Q (PING %Q), отсылаю pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Получен пинг от \r!s\r%Q\r (PING %Q), отсылаю pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Получен pong от !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Получен pong от \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5383,17 +5426,33 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] зашел на !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] зашел на \r!c\r%Q\r [implicit +%c umode change]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] зашёл на !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr ""
+"\r!n\n"
+"%Q\n"
+"[%Q@\n"
+"!h\n"
+"%Q\n"
+"] зашёл на \n"
+"!c\n"
+"%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] только что зашёл на !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr ""
+"\r!n\n"
+"%Q\n"
+"[%Q@\n"
+"!h\n"
+"%Q\n"
+"] только что зашёл на\n"
+"!c\n"
+"%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5401,28 +5460,28 @@ msgstr ""
 "Получена часть сообщения от неизвестного канала, возможна рассинхронизация"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Вы покидаете канал !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Вы покидаете канал \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Вы покидаете канал !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Вы покидаете канал \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] покинул !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] покинул \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] покинул !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] покинул \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!nс%Q [%Q@!h%Q] только что покинул !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!nс\r%Q\r [%Q@\r!h\r%Q\r] только что покинул \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!nс%Q [%Q@!h%Q] только что покинул !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!nс\r%Q\r [%Q@\r!h\r%Q\r] только что покинул \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5431,8 +5490,8 @@ msgstr "Обнаружен обрыв сети: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] вышел из IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] вышел из IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5441,28 +5500,28 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Вас кикнули !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Вас кикнули \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Попытка вернуться !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Попытка вернуться \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] кикнут на !c%Q by !n%Q [%Q@!h%Q"
-"]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] кикнут на \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] только что был кикнут на !c%Q by !n%Q "
-"[%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] только что был кикнут на \r!c\r%Q\r by \r!n\r%Q\r "
+"[%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5473,23 +5532,23 @@ msgstr ""
 "его декодировать: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Проигнорировано приватное сообщение от !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Проигнорировано приватное сообщение от \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Спам сообщение от !n%Q [%Q@!h%Q]: %Q (совпадает со спам-словом "
+"Спам сообщение от \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (совпадает со спам-словом "
 "\"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Проигнорировано сообщение в канал от !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Проигнорировано сообщение в канал от \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Проигнорировано уведомление от !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Проигнорировано уведомление от \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5507,9 +5566,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Спам извещение от !n%Q [%Q@!h%Q]: %Q (совпадает со спам-словом "
+"Спам извещение от \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (совпадает со спам-словом "
 "\"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5518,29 +5577,29 @@ msgstr ""
 "Получено сообщение с темой от неизвестного канала, возможна рассинхронизация"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] изменил тему на \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] изменил тему на \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] теперь известен как !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] теперь известен как \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Цель привата была утеряна и обнаружилась когда !n%Q [%Q@!h%Q] "
-"сменил свой ник на !n%Q"
+"Цель привата была утеряна и обнаружилась когда \r!n\r%Q\r [%Q@\r!h\r%Q\r] "
+"сменил свой ник на \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Недавнее изменение ника у !n%Q to !n%Q является причиной "
+"Недавнее изменение ника у \r!n\r%Q\r to \r!n\r%Q\r является причиной "
 "противоречия окнах приватов: слияние вывода"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5548,8 +5607,8 @@ msgid "End of merged output"
 msgstr "Конец слияния вывода"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Проигнорировано приглашение от !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Проигнорировано приглашение от \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5560,8 +5619,8 @@ msgid "double-click the channel name to join"
 msgstr "для входа используйте двойной клик"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] приглашает вас на канал !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] приглашает вас на канал \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5570,8 +5629,8 @@ msgstr ""
 "рассинхронизация"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS от !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS от \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5584,33 +5643,33 @@ msgstr ""
 "Получено изменение режима от неизвестного канала, возможна рассинхронизация"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] включил ключ канала \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] включил ключ канала \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] выключил ключ канала"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] установил на канале !m-lлимит в %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] установил на канале \r!m-l\rлимит в %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] выключил лимит на канале"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] включил режим %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] включил режим %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] включил на канале !m%c%c режим %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] включил на канале \r!m%c%c\r режим %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] включил режим %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] включил режим %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5676,12 +5735,12 @@ msgid "This server supports: %s"
 msgstr "Этот сервер поддерживает: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Окончание NAMES для !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Окончание NAMES для \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Имена для !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Имена для \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5692,16 +5751,16 @@ msgid "Channel topic is: %Q"
 msgstr "Тема канала: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Тема канала !c%Q - %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Тема канала \r!c\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Тема канала не установлена"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Тема канала !c%Q не установлена"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Тема канала \r!c\r%Q\r не установлена"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5712,20 +5771,20 @@ msgid "Topic was set by %Q"
 msgstr "Тема установлена %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Тема канала !c%Q установлена %Q на %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Тема канала \r!c\r%Q\r установлена %Q на %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Тема канала !c%Q установлена %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Тема канала \r!c\r%Q\r установлена %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Режим канала !c%Q - %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Режим канала \r!c\r%Q\r - %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Режим канала !n%Q - %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Режим канала \r!n\r%Q\r - %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5734,8 +5793,8 @@ msgid "(Unknown)"
 msgstr "(Неизвестный)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Окончание канала %Q для !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Окончание канала %Q для \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5750,8 +5809,8 @@ msgid "ban exception list"
 msgstr "список исключений из банов"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q для !c%Q: !m-%c%Q (установлено %Q из %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q для \r!c\r%Q\r: \r!m-%c\r%Q\r (установлено %Q из %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5767,12 +5826,12 @@ msgstr "Список исключений из банов"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Ответ WHO от %c!n%Q%c [%Q@!h%Q]: %c Канал %c: !c%Q, %c "
-"Сервер %c: !s%Q, %c Прыжков %c: %d, %c Флаги %c: %Q, %c Отошёл %c: %Q, "
+"Ответ WHO от %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %c Канал %c: \r!c\r%Q\r, %c "
+"Сервер %c: \r!s\r%Q\r, %c Прыжков %c: %d, %c Флаги %c: %Q, %c Отошёл %c: %Q, "
 "%c Реальное имя %c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5792,8 +5851,8 @@ msgid ""
 msgstr "Сервер отклоняет вход по всем никам, вы должны послать ник вручную"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Невозможно войти под ником '!n%Q' (%d: %Q), пробую '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Невозможно войти под ником '\r!n\r%Q\r' (%d: %Q), пробую '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5812,60 +5871,64 @@ msgid "End of help about %Q"
 msgstr "Конец справки о %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c отошёл: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c отошёл: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c является %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c является %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c реальное имя: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c реальное имя: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c был %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c был %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c было реальное имя: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c было реальное имя: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c каналы: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c каналы: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr "Получен битый RPL_WHOISIDLE, не могу определить время простоя"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c время неактивности: %u д %u ч %u м %u с"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr ""
+"%c\n"
+"!n\n"
+"%Q\n"
+"%c время неактивности: %u д %u ч %u м %u с"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c время авторизации: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c время авторизации: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c сервер: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c сервер: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c идентифицирован как: %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c идентифицирован как: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c информация: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c информация: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c WHOIS информация от !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOIS информация от \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c WHOWAS информация от !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOWAS информация от \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -5876,8 +5939,8 @@ msgid "Channel was created at %Q"
 msgstr "Канал создан %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Канал !c%Q создан %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Канал \r!c\r%Q\r создан %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -5925,37 +5988,37 @@ msgstr "Установка ника в режиме Отошёл (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!s%s%c информация о сервере: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!s\r%s\r%c информация о сервере: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!s%s%c администратор %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!s\r%s\r%c администратор %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!s%s%c контактный адрес %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!s\r%s\r%c контактный адрес %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q приглашает %Q на канал %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r приглашает %Q на канал %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!s%s%c's информация:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!s\r%s\r%c's информация:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Конец %c!s%s%c's информации"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Конец %c\r!s\r%s\r%c's информации"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%s%c's время %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\r%c's время %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -5987,8 +6050,8 @@ msgid "Your encoding is now %Q"
 msgstr "Используемая кодировка %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c использует кодировку %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c использует кодировку %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7230,19 +7293,19 @@ msgstr "Общие каналы: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Цель привата изменена с !n%Q [%Q@!h%Q] на !n%Q [%Q@!h%Q"
-"]"
+"Цель привата изменена с \r!n\r%Q\r [%Q@\r!h\r%Q\r] на \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Общие каналы для !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Общие каналы для \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Нет общих каналов для !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Нет общих каналов для \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/sr.po b/translations/messages/kvirc/sr.po
index 1ddf603e..84ac4de5 100644
--- a/translations/messages/kvirc/sr.po
+++ b/translations/messages/kvirc/sr.po
@@ -2814,12 +2814,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Lista obavetenja: !n%Q izgleda da je na vezi , ali maska (%Q@!h%Q"
-") se ne poklapa (neko drugi koristi njegov pseudonim ili se tvoja "
+"Lista obavetenja: \r!n\r%Q\r izgleda da je na vezi , ali maska (%Q@\r!h\r%Q"
+"\r) se ne poklapa (neko drugi koristi njegov pseudonim ili se tvoja "
 "registrovana maska(e) ne poklapa)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2833,10 +2833,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Lista obavetenja: neo�kivana nedoslednost: mislim da imamo !n%Q u "
+"Lista obavetenja: neo�kivana nedoslednost: mislim da imamo \r!n\r%Q\r u "
 "re�iku registrovanik korisnika..."
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2875,10 +2875,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Lista obavetenja: izgleda da je !n%Q otiao dok sam cekao njegov "
+"Lista obavetenja: izgleda da je \r!n\r%Q\r otiao dok sam cekao njegov "
 "USERHOST odgovor, proveri� u slede�m krugu"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2924,12 +2924,12 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Lista obavetenja: !n%Q izgleda da je na vezi , ali maska (%Q@!h%Q"
-") se ne poklapa (traga� neko drugi koristi njegov nadimak ili se vaa "
+"Lista obavetenja: \r!n\r%Q\r izgleda da je na vezi , ali maska (%Q@\r!h\r%Q"
+"\r) se ne poklapa (traga� neko drugi koristi njegov nadimak ili se vaa "
 "registrovana maska ne poklapa)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2950,8 +2950,8 @@ msgid "removed from watch list"
 msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Lista obavetenja: zaustavljeno traganje za !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Lista obavetenja: zaustavljeno traganje za \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 #, fuzzy
@@ -2959,8 +2959,8 @@ msgid "watch"
 msgstr "Putanja"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Lista obavetenja: !n%Q nej na vezi (traga�"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Lista obavetenja: \r!n\r%Q\r nej na vezi (traga�"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5504,12 +5504,12 @@ msgstr "Iz�tan modul '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, fuzzy, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr "Ignoriem PRIVMSG od %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, fuzzy, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
 msgstr "Ignoriem PRIVMSG od %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
@@ -5523,7 +5523,7 @@ msgstr "CTCP Kanala"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
 #, fuzzy
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "%Q %S odgovor od %Q [%Q@%Q]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
@@ -5533,7 +5533,7 @@ msgstr "Slede� CTCP zahtev ima nepoznatu metu %Q"
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 #, fuzzy
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr "%Q %S zahtev od %Q [%Q@%Q] (%Q): ignorisan (flood limit ostvaren)"
 
@@ -5552,7 +5552,7 @@ msgstr "odgovoreno"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
 #, fuzzy
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 msgstr "%Q %S zahtev od %Q [%Q@%Q] (%Q): %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
@@ -5569,7 +5569,7 @@ msgstr ""
 "verujte prikazanom vremenu"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
 msgstr "%Q PING odgovor od %Q [%Q@%Q]: ~ %u sekundi %u msekundi"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
@@ -5578,7 +5578,7 @@ msgstr "Slede� CTCP zahtev ima nepoznatu metu %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
 #, fuzzy
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "CTCP ACTION od %Q [%Q@%Q] ka nepoznatoj meti %Q: %s"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
@@ -5652,12 +5652,12 @@ msgstr ": Nema takvog nadimka u bazi korisnika; ignoriem promene"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
 #, fuzzy
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 msgstr "Ignoriem DCC %S zahtev od %Q [%Q@%Q] (%S %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
 #, fuzzy
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 msgstr "Obra�jem DCC %Q zahtev od %Q [%Q@%Q] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
@@ -5672,13 +5672,13 @@ msgstr "Ne mogu da odradim gornji zahtev: dcc modul izgleda da je ote�n"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
 #, fuzzy
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Primljen ping od !s%s (PING %s) : odgovoren pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Primljen ping od \r!s\r%s\r (PING %s) : odgovoren pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, fuzzy, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Primljen ping od !s%s (PING %s) : odgovoren pong"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Primljen ping od \r!s\r%s\r (PING %s) : odgovoren pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 #, fuzzy
@@ -5698,19 +5698,19 @@ msgstr "Primljena PART poruka za nepoznat kanal...desinhronizovano?"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 #, fuzzy
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] ulazi na !c%Q [implicitno +%c promena umoda]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] ulazi na \r!c\r%Q\r [implicitno +%c promena umoda]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] ulazi na !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] ulazi na \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] upravo ulazi na !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] upravo ulazi na \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 #, fuzzy
@@ -5719,31 +5719,31 @@ msgstr "Primljena PART poruka za nepoznat kanal...desinhronizovano?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
 #, fuzzy
-msgid "You have left channel !c%Q"
-msgstr "Napustio si kanal !c%Q :%s"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Napustio si kanal \r!c\r%Q\r :%s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Napustio si kanal !c%Q :%Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Napustio si kanal \r!c\r%Q\r :%Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] je napustio !c%Q :%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je napustio \r!c\r%Q\r :%Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] je napustio !c%Q :%s"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je napustio \r!c\r%Q\r :%s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] je upravo napustio !c%Q :%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je upravo napustio \r!c\r%Q\r :%Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
 #, fuzzy
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] je upravo napustio !c%Q :%s"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je upravo napustio \r!c\r%Q\r :%s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, fuzzy, c-format
@@ -5753,8 +5753,8 @@ msgstr "Detektovano razdvajanje mrea :%s"
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
 #, fuzzy
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] je prekinuo IRC %Q%s"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je prekinuo IRC %Q%s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 #, fuzzy
@@ -5763,28 +5763,28 @@ msgstr "Primljena PART poruka za nepoznat kanal...desinhronizovano?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Izba�ni ste sa !c%Q od !n%Q [%Q@!h%Q] :%Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Izba�ni ste sa \r!c\r%Q\r od \r!n\r%Q\r [%Q@\r!h\r%Q\r] :%Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Pokuavam da ponovo u�m na !c%Q"
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Pokuavam da ponovo u�m na \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] je izba�n sa !c%Q od !n%Q [%Q@!h%Q"
-"] :%Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] je izba�n sa \r!c\r%Q\r od \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r] :%Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] je upravo izba�n sa !c%Q od !n%Q [%Q@"
-"!h%Q] :%Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] je upravo izba�n sa \r!c\r%Q\r od \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r] :%Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 #, fuzzy
@@ -5797,24 +5797,24 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
 #, fuzzy
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Ignoriem PRIVMSG od %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Spam privatna poruka od !n%Q [%Q@!h%Q]: %Q (poklapa se sa spam "
+"Spam privatna poruka od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (poklapa se sa spam "
 "re�u \"%s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
 #, fuzzy
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Ignoriem PRIVMSG od %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
 #, fuzzy
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr "Ignoriem PRIVMSG od %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
@@ -5835,9 +5835,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Spam obavetenje od !n%Q [%Q@!h%Q]: %Q (poklapa se sa spam re�u "
+"Spam obavetenje od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (poklapa se sa spam re�u "
 "\"%Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5846,24 +5846,24 @@ msgid "Received a topic message for an unknown channel, possible desync"
 msgstr "Primljena PART poruka za nepoznat kanal...desinhronizovano?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] je promenio topic (naslov) u \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je promenio topic (naslov) u \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] je sad poznat kao !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] je sad poznat kao \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
 
@@ -5873,7 +5873,7 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
 #, fuzzy
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr "Ignoriem PRIVMSG od %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
@@ -5886,8 +5886,8 @@ msgid "double-click the channel name to join"
 msgstr "dupli klik na ima kanala za ulazak"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] vas poziva na kanal !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vas poziva na kanal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 #, fuzzy
@@ -5895,8 +5895,8 @@ msgid "Received an invite message directed to another nick, possible desync"
 msgstr "Primljena je INVITE poruka namenjena nekom drugom...hmmm"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS od !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS od \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5909,34 +5909,34 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Primljena PART poruka za nepoznat kanal...desinhronizovano?"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] je postavio klju�kanala u \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] je postavio klju�kanala u \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] je sklonio klju�kanala"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] je postavio na kanalu !m-lograni�nje na %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] je postavio na kanalu \r!m-l\rograni�nje na %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] je uklonio ograni�nje kanala"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] je postavio mod %ce !m%ce%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] je postavio mod %ce \r!m%ce\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] je postavio na kanalu !m%c%cmod %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] je postavio na kanalu \r!m%c%c\rmod %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
 #, fuzzy
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] je postavio mod %ce !m%ce%c"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] je postavio mod %ce \r!m%ce\r%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -6002,12 +6002,12 @@ msgid "This server supports: %s"
 msgstr "[Serverov parser]: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Kraj imena za !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Kraj imena za \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Imena za !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Imena za \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 #, fuzzy
@@ -6019,16 +6019,16 @@ msgid "Channel topic is: %Q"
 msgstr "Naslov kanala (topic) je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Naslov (topic) za !c%Q je: %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Naslov (topic) za \r!c\r%Q\r je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Nema postavljenog naslova kanala"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Nema postavljenog naslova za kanal !c%Q"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Nema postavljenog naslova za kanal \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 #, fuzzy
@@ -6042,21 +6042,21 @@ msgstr "Naslov je postavljen od \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Naslov za !c%Q je postavljen od !n%Q u %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Naslov za \r!c\r%Q\r je postavljen od \r!n\r%Q\r u %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
 #, fuzzy
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Naslov (topic) za !c%Q je: %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Naslov (topic) za \r!c\r%Q\r je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Mod kanala za !c%Q je %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Mod kanala za \r!c\r%Q\r je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Mod kanala za !c%Q je %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Mod kanala za \r!c\r%Q\r je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -6066,8 +6066,8 @@ msgstr "(Nepoznat)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
 #, fuzzy
-msgid "End of channel %Q for !c%Q"
-msgstr "Kraj liste zabrana (ban) za !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Kraj liste zabrana (ban) za \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 #, fuzzy
@@ -6086,8 +6086,8 @@ msgstr "maske izuzetaka zabrane"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
 #, fuzzy
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "Unos zabrane (ban) za !c%Q: !m-b%Q (postavljen od %c u %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "Unos zabrane (ban) za \r!c\r%Q\r: \r!m-b\r%Q\r (postavljen od %c u %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 #, fuzzy
@@ -6107,12 +6107,12 @@ msgstr "maske izuzetaka zabrane"
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 #, fuzzy
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Ko (WHO) unos za %c!n%Q%c[%Q@!h%Q]: %cKanal:%c !c%Q, "
-"%cServer%c: !s%Q, %cSkokova:%c %d, %cOdsutnost:%c %Q. %cStvarno ime:%c "
+"Ko (WHO) unos za %c\r!n\r%Q\r%c[%Q@\r!h\r%Q\r]: %cKanal:%c \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cSkokova:%c %d, %cOdsutnost:%c %Q. %cStvarno ime:%c "
 "%Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -6133,8 +6133,8 @@ msgid ""
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Nema anse da se logujete kao '!n%Q' (%d:%Q): pokuavam '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Nema anse da se logujete kao '\r!n\r%Q\r' (%d:%Q): pokuavam '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -6156,29 +6156,29 @@ msgid "End of help about %Q"
 msgstr "Kraj /WHO liste za %W"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c je odsutan: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c je odsutan: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c je %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c je %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
 #, fuzzy
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c - pravo ime je: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c - pravo ime je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c je %c!n%Q!%Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c je %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c - pravo ime je: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c - pravo ime je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c - kanali: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c - kanali: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 #, fuzzy
@@ -6186,33 +6186,33 @@ msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr "Primljen prekinut RPL_WHOISIDLE: nemogu da procenim vreme neaktivnosti"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c - vreme neaktivnosti: %u d %u h %u m %u s"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c - vreme neaktivnosti: %u d %u h %u m %u s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c - vreme logovanja: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c - vreme logovanja: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c - server: !s%Q : %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c - server: \r!s\r%Q\r : %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
 #, fuzzy
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c - pravo ime je: %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c - pravo ime je: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c - informacije: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c - informacije: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c ko je (whois) informacije od !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c ko je (whois) informacije od \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c ko je (whois) informacije od !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c ko je (whois) informacije od \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 #, fuzzy
@@ -6224,8 +6224,8 @@ msgid "Channel was created at %Q"
 msgstr "Kanal je kreiran u %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Kanal !c%Q je bio kreiran u %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Kanal \r!c\r%Q\r je bio kreiran u %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -6276,39 +6276,39 @@ msgstr "Server %Q ima nadimak: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, fuzzy, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!n%Q%c - informacije: %Q"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!n\r%Q\r%c - informacije: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, fuzzy, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!n%Q%c - informacije: %Q"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!n\r%Q\r%c - informacije: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, fuzzy, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!n%Q%c - kanali: %Q"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!n\r%Q\r%c - kanali: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
 #, fuzzy
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q [%Q@!h%Q] vas poziva na kanal !c%Q (%Q)"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] vas poziva na kanal \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, fuzzy, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!n%Q%c - informacije: %Q"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!n\r%Q\r%c - informacije: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
+msgid "End of %c\r!s\r%s\r%c's information"
 msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
 #, fuzzy
-msgid "%c!s%s%c's time is %Q"
-msgstr "[!s%s]: %s"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "[\r!s\r%s\r]: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -6346,8 +6346,8 @@ msgstr "Va korisni�i mod je %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
 #, fuzzy
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c - kanali: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c - kanali: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7721,17 +7721,17 @@ msgstr "Komandna linija: %s"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Uobi�jeni kanali za !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Uobi�jeni kanali za \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Nema uobi�jenih kanala za !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Nema uobi�jenih kanala za \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
diff --git a/translations/messages/kvirc/uk.po b/translations/messages/kvirc/uk.po
index c8c20d15..c61bdaa9 100644
--- a/translations/messages/kvirc/uk.po
+++ b/translations/messages/kvirc/uk.po
@@ -2657,11 +2657,11 @@ msgstr "Реєстраційна маска змінилася або Нік в
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:686
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (registration mask does not match, or nickname is being used "
 "by someone else)"
 msgstr ""
-"Список повідомлень: !n%Q  в онлайне, але маска [%Q@!h%Q] не "
+"Список повідомлень: \r!n\r%Q\r  в онлайне, але маска [%Q@\r!h\r%Q\r] не "
 "відповідає ( маска не відповідає, або Нік використається ким те ще)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:691
@@ -2674,10 +2674,10 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:698
 msgid ""
-"Notify list: Unexpected inconsistency, expected !n%Q in the registered "
+"Notify list: Unexpected inconsistency, expected \r!n\r%Q\r in the registered "
 "user DB"
 msgstr ""
-"Список повідомлень: Несподіване протиріччя, приблизно !n%Q "
+"Список повідомлень: Несподіване протиріччя, приблизно \r!n\r%Q\r "
 "зареєстрований у базі даних користувачів"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:712
@@ -2712,10 +2712,10 @@ msgstr "Список повідомлень: Бита відповідь USERHOS
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:860
 msgid ""
-"Notify list: !n%Q appears to have gone offline before USERHOST reply "
+"Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply "
 "was received, will recheck in the next loop"
 msgstr ""
-"Список повідомлень: !n%Q пішов в оффлайне перш, ніж була отримана "
+"Список повідомлень: \r!n\r%Q\r пішов в оффлайне перш, ніж була отримана "
 "відповідь від USERHOST, буде переперевірений у наступному циклі"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:931
@@ -2759,11 +2759,11 @@ msgstr ""
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1190
 msgid ""
-"Notify list: !n%Q appears to be online, but the mask [%Q@!h%Q] "
+"Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] "
 "does not match (watch: registration mask does not match, or nickname is "
 "being used by someone else)"
 msgstr ""
-"Список повідомлень: !n%Q з'явився в онлайн, але маска [%Q@!h%Q] "
+"Список повідомлень: \r!n\r%Q\r з'явився в онлайн, але маска [%Q@\r!h\r%Q\r] "
 "не відповідає (спостереження:маска не відповідає, або Нік уже використається)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1197
@@ -2783,16 +2783,16 @@ msgid "removed from watch list"
 msgstr "вилучений зі списку спостереження"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1248
-msgid "Notify list: Stopped watching for !n%Q"
-msgstr "Список повідомлень: Зупинене спостереження за !n%Q"
+msgid "Notify list: Stopped watching for \r!n\r%Q\r"
+msgstr "Список повідомлень: Зупинене спостереження за \r!n\r%Q\r"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1258
 msgid "watch"
 msgstr "спостереження"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1264
-msgid "Notify list: !n%Q is offline (watch)"
-msgstr "Список повідомлень: !n%Q в оффлайне (спостереження)"
+msgid "Notify list: \r!n\r%Q\r is offline (watch)"
+msgstr "Список повідомлень: \r!n\r%Q\r в оффлайне (спостереження)"
 
 #: src/kvirc/kernel/kvi_notifylist.cpp:1267
 msgid "unmatched watch list entry"
@@ -5215,13 +5215,13 @@ msgstr "Вивантаження модуля '%s'"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:823
 #, fuzzy, c-format
-msgid "Ignoring DCC from !nc%s [%s@!h%s]"
-msgstr "Зігноровано CTCP від !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Зігноровано CTCP від \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:840
 #, fuzzy, c-format
-msgid "Ignoring CTCP from !nc%s [%s@!h%s]"
-msgstr "Зігноровано CTCP від !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"
+msgstr "Зігноровано CTCP від \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:979
 msgid "The following CTCP reply has unrecognized target %Q"
@@ -5233,8 +5233,8 @@ msgid "Channel CTCP"
 msgstr "CTCP у канал"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:989
-msgid "%Q %Q reply from !n%Q [%Q@!h%Q]: %Q"
-msgstr "%Q %Q відповідь від !n%Q [%Q@!h%Q]: %Q"
+msgid "%Q %Q reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "%Q %Q відповідь від \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1019
 msgid "The following CTCP request has unrecognized target %Q"
@@ -5243,10 +5243,10 @@ msgstr "Запит CTCP має непізнану мету %Q"
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1033
 #, fuzzy
 msgid ""
-"%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), ignored (flood limit "
+"%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit "
 "exceeded)"
 msgstr ""
-" %Q %Q%c запит від !n%Q [%Q@!h%Q] (%Q), зігнорований (спрацювала "
+" %Q %Q%c запит від \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), зігнорований (спрацювала "
 "захист від флуда)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1037
@@ -5262,8 +5262,8 @@ msgid "replied"
 msgstr "відповідь"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1042
-msgid "%Q %Q%c request from !n%Q [%Q@!h%Q] (%Q), %Q"
-msgstr "%Q %Q%c запит від !n%Q [%Q@!h%Q] (%Q), %Q"
+msgid "%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
+msgstr "%Q %Q%c запит від \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1080
 msgid "The following CTCP PING reply has unrecognized target \"%Q\""
@@ -5277,16 +5277,16 @@ msgid ""
 msgstr "Відповідь PING CTCP має битий ідентифікатор часу \"%S\""
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1133
-msgid "%Q PING reply from !n%Q [%Q@!h%Q]: %u sec %u msec"
-msgstr "%Q відповідь PING від !n%Q [%Q@!h%Q]: %u сек %u мсек"
+msgid "%Q PING reply from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u sec %u msec"
+msgstr "%Q відповідь PING від \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %u сек %u мсек"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1455
 msgid "The following CTCP ACTION has unrecognized target %Q"
 msgstr "CTCP ACTION має непізнану мету %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1460
-msgid "CTCP ACTION from !n%Q [%Q@!h%Q]: %Q"
-msgstr "CTCP ACTION від !n%Q [%Q@!h%Q]: %Q"
+msgid "CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "CTCP ACTION від \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1506
 msgid "Unable to add file offer for file %Q (File not readable?)"
@@ -5347,12 +5347,12 @@ msgid ": No such nickname in the user database, ignoring the change"
 msgstr ": Не знайдений Нік у базі користувачів, зміни зігноровані"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1706
-msgid "Ignoring DCC %S request from !n%Q [%Q@!h%Q] (%Q %S)"
-msgstr "Зігнорований DCC %S запит від !n%Q [%Q@!h%Q] (%Q %S)"
+msgid "Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
+msgstr "Зігнорований DCC %S запит від \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1748
-msgid "Processing DCC %Q request from !n%Q [%Q@!h%Q] (%Q %s)"
-msgstr "Обробка DCC %Q запиту від !n%Q [%Q@!h%Q] (%Q %s)"
+msgid "Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
+msgstr "Обробка DCC %Q запиту від \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"
 
 #: src/kvirc/sparser/kvi_sp_ctcp.cpp:1759
 #, c-format
@@ -5365,13 +5365,13 @@ msgid "Unable to process the above request: DCC module may be broken"
 msgstr "Не можу обробити запит, що надійшов: Модуль DCC ушкоджений"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:100
-msgid "Received ping from !s%Q (PING %Q), replied pong"
-msgstr "Отриманий пінг від !s%Q (PING %Q), відсилаю pong"
+msgid "Received ping from \r!s\r%Q\r (PING %Q), replied pong"
+msgstr "Отриманий пінг від \r!s\r%Q\r (PING %Q), відсилаю pong"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:127
 #, c-format
-msgid "Received pong from !s%s (PONG %s)"
-msgstr "Отриманий pong від !s%s (PONG %s)"
+msgid "Received pong from \r!s\r%s\r (PONG %s)"
+msgstr "Отриманий pong від \r!s\r%s\r (PONG %s)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:153
 msgid "Server ERROR: %Q"
@@ -5388,17 +5388,17 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:307
 msgid ""
-"!n%Q [%Q@!h%Q] has joined !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r [implicit +%c umode change]"
 msgstr ""
-"!n%Q [%Q@!h%Q] зайшов на !c%Q [implicit +%c umode change]"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] зайшов на \r!c\r%Q\r [implicit +%c umode change]"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:312
-msgid "!n%Q [%Q@!h%Q] has joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] зайшов на !c%Q "
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] зайшов на \r!c\r%Q\r "
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:326
-msgid "!n%Q [%Q@!h%Q] has just joined !c%Q"
-msgstr "!n%Q [%Q@!h%Q] тільки що зайшов на !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] тільки що зайшов на \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:357
 msgid "Received a part message for an unknown channel, possible desync"
@@ -5406,28 +5406,28 @@ msgstr ""
 "Отримана частина повідомлення від невідомого каналу, можлива розсинхрузування"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:386
-msgid "You have left channel !c%Q"
-msgstr "Ви залишаєте канал !c%Q"
+msgid "You have left channel \r!c\r%Q\r"
+msgstr "Ви залишаєте канал \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:388
-msgid "You have left channel !c%Q: %Q"
-msgstr "Ви залишаєте канал !c%Q: %Q"
+msgid "You have left channel \r!c\r%Q\r: %Q"
+msgstr "Ви залишаєте канал \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:404
-msgid "!n%Q [%Q@!h%Q] has left !c%Q: %Q"
-msgstr "!n%Q [%Q@!h%Q] покинув !c%Q: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] покинув \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:408
-msgid "!n%Q [%Q@!h%Q] has left !c%Q"
-msgstr "!n%Q [%Q@!h%Q] покинув !c%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has left \r!c\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] покинув \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:422
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q: %Q"
-msgstr "!nс%Q [%Q@!h%Q] тільки що покинув !c%Q: %Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"
+msgstr "\r!nс\r%Q\r [%Q@\r!h\r%Q\r] тільки що покинув \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:426
-msgid "!nc%Q [%Q@!h%Q] has just left !c%Q"
-msgstr "!nс%Q [%Q@!h%Q] тільки що покинув !c%Q"
+msgid "\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"
+msgstr "\r!nс\r%Q\r [%Q@\r!h\r%Q\r] тільки що покинув \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:496
 #, c-format
@@ -5436,8 +5436,8 @@ msgstr "Виявлений обрив мережі: %s"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:548
 #: src/kvirc/sparser/kvi_sp_literal.cpp:564
-msgid "!n%Q [%Q@!h%Q] has quit IRC: %Q"
-msgstr "!n%Q [%Q@!h%Q] вийшов з IRC: %Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] вийшов з IRC: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:591
 msgid "Received a kick message for an unknown channel, possible desync"
@@ -5447,28 +5447,28 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:618
 #: src/kvirc/sparser/kvi_sp_literal.cpp:628
-msgid "You have been kicked from !c%Q by !n%Q [%Q@!h%Q]: %Q"
-msgstr "Вас кікнули !c%Q by !n%Q [%Q@!h%Q]: %Q"
+msgid "You have been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Вас кікнули \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:635
-msgid "Attempting to rejoin !c%Q..."
-msgstr "Спроба повернутися !c%Q..."
+msgid "Attempting to rejoin \r!c\r%Q\r..."
+msgstr "Спроба повернутися \r!c\r%Q\r..."
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:672
 msgid ""
-"!n%Q [%Q@!h%Q] has been kicked from !c%Q by !n%Q [%Q@"
-"!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@"
+"\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] кікнут на !c%Q by !n%Q [%Q@!h%Q"
-"]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] кікнут на \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:684
 msgid ""
-"!n%Q [%Q@!h%Q] has just been kicked from !c%Q by !n%Q"
-" [%Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q"
+"\r [%Q@\r!h\r%Q\r]: %Q"
 msgstr ""
-"!n%Q [%Q@!h%Q] тільки що був кікнут на !c%Q by !n%Q "
-"[ %Q@!h%Q]: %Q"
+"\r!n\r%Q\r [%Q@\r!h\r%Q\r] тільки що був кікнут на \r!c\r%Q\r by \r!n\r%Q\r "
+"[ %Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:712
 msgid ""
@@ -5479,23 +5479,23 @@ msgstr ""
 "його декодувати: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:778
-msgid "Ignoring query-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Зігнороване приватне повідомлення від !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring query-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Зігнороване приватне повідомлення від \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:845
 msgid ""
-"Spam privmsg from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%s\")"
+"Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"
 msgstr ""
-"Спам повідомлення від !n%Q [%Q@!h%Q]: %Q (збігається зі спам-"
+"Спам повідомлення від \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (збігається зі спам-"
 "словом \" %s\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:979
-msgid "Ignoring channel-PRIVMSG from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Зігнороване повідомлення в канал від !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring channel-PRIVMSG from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Зігнороване повідомлення в канал від \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1101
-msgid "Ignoring Notice from !nc%Q [%Q@!h%Q]: %Q"
-msgstr "Зігнороване повідомлення від !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Зігнороване повідомлення від \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1137
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1154
@@ -5513,9 +5513,9 @@ msgstr ""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1208
 msgid ""
-"Spam notice from !n%Q [%Q@!h%Q]: %Q (matching spamword \"%Q\")"
+"Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"
 msgstr ""
-"Спам повідомлення від !n%Q [%Q@!h%Q]: %Q (збігається зі спам-"
+"Спам повідомлення від \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (збігається зі спам-"
 "словом \" %Q\")"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1382
@@ -5524,29 +5524,29 @@ msgstr ""
 "Отримане повідомлення з темою від невідомого каналу, можлива розсинхрузування"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1401
-msgid "!n%Q [%Q@!h%Q] has changed topic to \"%Q%c\""
-msgstr "!n%Q [%Q@!h%Q] змінив тему на \"%Q%c\""
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] змінив тему на \"%Q%c\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1434
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1480
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1500
-msgid "!n%Q [%Q@!h%Q] is now known as !n%Q"
-msgstr "!n%Q [%Q@!h%Q] тепер відомий як !n%Q"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] тепер відомий як \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1465
 msgid ""
-"The target of this query was lost and has been found when !n%Q [%Q@!h"
-"%Q] changed his nickname to !n%Q"
+"The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h"
+"\r%Q\r] changed his nickname to \r!n\r%Q\r"
 msgstr ""
-"Ціль привата була загублена й виявилася коли !n%Q [%Q@!h%Q] "
-"перемінив свій Нік на !n%Q"
+"Ціль привата була загублена й виявилася коли \r!n\r%Q\r [%Q@\r!h\r%Q\r] "
+"перемінив свій Нік на \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1474
 msgid ""
-"The recent nickname change from !n%Q to !n%Q caused a query "
+"The recent nickname change from \r!n\r%Q\r to \r!n\r%Q\r caused a query "
 "collision: merging output"
 msgstr ""
-"Недавня зміна ніка в !n%Q to !n%Q є причиною протиріччя вікнах "
+"Недавня зміна ніка в \r!n\r%Q\r to \r!n\r%Q\r є причиною протиріччя вікнах "
 "приватів: злиття висновку"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1483
@@ -5554,8 +5554,8 @@ msgid "End of merged output"
 msgstr "Кінець злиття висновку"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1528
-msgid "Ignoring invite from !nc%Q [%Q@!h%Q]"
-msgstr "Зігнороване запрошення від !nс%Q [%Q@!h%Q]: %Q"
+msgid "Ignoring invite from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Зігнороване запрошення від \r!nс\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1543
 msgid "autojoining"
@@ -5566,8 +5566,8 @@ msgid "double-click the channel name to join"
 msgstr "для входу використайте подвійний клич"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1544
-msgid "!n%Q [%Q@!h%Q] invites you to channel !c%Q (%Q)"
-msgstr "!n%Q [%Q@!h%Q] запрошує вас на канал !c%Q (%Q)"
+msgid "\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"
+msgstr "\r!n\r%Q\r [%Q@\r!h\r%Q\r] запрошує вас на канал \r!c\r%Q\r (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1552
 msgid "Received an invite message directed to another nick, possible desync"
@@ -5576,8 +5576,8 @@ msgstr ""
 "розсинхрузування"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1572
-msgid "WALLOPS from !n%Q [%Q@!h%Q]: %Q"
-msgstr "WALLOPS від !n%Q [%Q@!h%Q]: %Q"
+msgid "WALLOPS from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "WALLOPS від \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1636
 #, c-format
@@ -5589,33 +5589,33 @@ msgid "Received a mode change for an unknown channel, possible desync"
 msgstr "Отримана зміна режиму від невідомого каналу, можлива розсинхрузування"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1719
-msgid "%Q [%Q@%Q] has set channel key to \"!m-k%Q\""
-msgstr "%Q [%Q@%Q] включив ключ каналу \"!m-k%Q\""
+msgid "%Q [%Q@%Q] has set channel key to \"\r!m-k\r%Q\r\""
+msgstr "%Q [%Q@%Q] включив ключ каналу \"\r!m-k\r%Q\r\""
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1722
 msgid "%Q [%Q@%Q] has unset the channel key"
 msgstr "%Q [%Q@%Q] виключив ключ каналу"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1742
-msgid "%Q [%Q@%Q] has set channel !m-llimit to %Q"
-msgstr "%Q [%Q@%Q] установив на каналі !m-lлимит в %Q"
+msgid "%Q [%Q@%Q] has set channel \r!m-l\rlimit to %Q\r"
+msgstr "%Q [%Q@%Q] установив на каналі \r!m-l\rлимит в %Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1745
 msgid "%Q [%Q@%Q] has unset the channel limit"
 msgstr "%Q [%Q@%Q] виключив ліміт на каналі"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1767
-msgid "%Q [%Q@%Q] has set mode %c%c !n%Q"
-msgstr "%Q [%Q@%Q] включив режим %c%c !n%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!n\r%Q\r"
+msgstr "%Q [%Q@%Q] включив режим %c%c \r!n\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1775
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1822
-msgid "%Q [%Q@%Q] has set channel !m%c%cmode %c%c"
-msgstr "%Q [%Q@%Q] включив на каналі !m%c%c режим %c%c"
+msgid "%Q [%Q@%Q] has set channel \r!m%c%c\rmode %c%c\r"
+msgstr "%Q [%Q@%Q] включив на каналі \r!m%c%c\r режим %c%c\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1807
-msgid "%Q [%Q@%Q] has set mode %c%c !m%c%c%Q"
-msgstr "%Q [%Q@%Q] включив режим %c%c !m%c%c%Q"
+msgid "%Q [%Q@%Q] has set mode %c%c \r!m%c%c\r%Q\r"
+msgstr "%Q [%Q@%Q] включив режим %c%c \r!m%c%c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_literal.cpp:1848
 msgid "%Q [%Q@%Q] has set mode %s %Q"
@@ -5680,12 +5680,12 @@ msgid "This server supports: %s"
 msgstr "Цей сервер підтримує: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:375
-msgid "End of NAMES for !c%Q"
-msgstr "Закінчення NAMES для !c%Q"
+msgid "End of NAMES for \r!c\r%Q\r"
+msgstr "Закінчення NAMES для \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:472
-msgid "Names for !c%Q: %Q"
-msgstr "Імена для !c%Q: %Q"
+msgid "Names for \r!c\r%Q\r: %Q"
+msgstr "Імена для \r!c\r%Q\r: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:487
 msgid "(unknown)"
@@ -5696,16 +5696,16 @@ msgid "Channel topic is: %Q"
 msgstr "Тема каналу: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:498
-msgid "Topic for !c%Q is: %Q"
-msgstr "Тема каналу !c%Q - %Q"
+msgid "Topic for \r!c\r%Q\r is: %Q"
+msgstr "Тема каналу \r!c\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:516
 msgid "No channel topic is set"
 msgstr "Тема каналу не встановлена"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:521
-msgid "No topic is set for channel !c%Q"
-msgstr "Тема каналу !c%Q не встановлена"
+msgid "No topic is set for channel \r!c\r%Q\r"
+msgstr "Тема каналу \r!c\r%Q\r не встановлена"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:560
 msgid "Topic was set by %Q on %Q"
@@ -5716,20 +5716,20 @@ msgid "Topic was set by %Q"
 msgstr "Тема встановлена %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:569
-msgid "Topic for !c%Q was set by %Q on %Q"
-msgstr "Тема каналу !c%Q установлена %Q на %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q on %Q"
+msgstr "Тема каналу \r!c\r%Q\r установлена %Q на %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:572
-msgid "Topic for !c%Q was set by %Q"
-msgstr "Тема каналу !c%Q установлена %Q"
+msgid "Topic for \r!c\r%Q\r was set by %Q"
+msgstr "Тема каналу \r!c\r%Q\r установлена %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:592
-msgid "Channel mode for !c%Q is %s"
-msgstr "Режим каналу !c%Q - %s"
+msgid "Channel mode for \r!c\r%Q\r is %s"
+msgstr "Режим каналу \r!c\r%Q\r - %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:595
-msgid "User mode for !n%Q is %s"
-msgstr "Режим каналу !n%Q - %s"
+msgid "User mode for \r!n\r%Q\r is %s"
+msgstr "Режим каналу \r!n\r%Q\r - %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:610
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:647 src/kvirc/ui/kvi_channel.cpp:1437
@@ -5738,8 +5738,8 @@ msgid "(Unknown)"
 msgstr "(Невідомий)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:631
-msgid "End of channel %Q for !c%Q"
-msgstr "Закінчення каналу %Q для !c%Q"
+msgid "End of channel %Q for \r!c\r%Q\r"
+msgstr "Закінчення каналу %Q для \r!c\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:635
 msgid "ban list"
@@ -5754,8 +5754,8 @@ msgid "ban exception list"
 msgstr "список виключень із банів"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:658
-msgid "%Q for !c%Q: !m-%c%Q (set by %Q on %Q)"
-msgstr "%Q для !c%Q: !m-%c%Q (установлено %Q з %Q)"
+msgid "%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"
+msgstr "%Q для \r!c\r%Q\r: \r!m-%c\r%Q\r (установлено %Q з %Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:665
 msgid "Ban listing"
@@ -5772,12 +5772,12 @@ msgstr "Список виключень із банів"
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:740
 #, fuzzy
 msgid ""
-"WHO entry for %c!n%Q%c [%Q@!h%Q]: %cChannel%c: !c%Q, "
-"%cServer%c: !s%Q, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
+"WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, "
+"%cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal "
 "name%c: %Q"
 msgstr ""
-"Відповідь WHO від %c!n%Q%c [%Q@!h%Q]: %c Канал %c: !c%Q, "
-"%c Сервер %c: !s%Q, %c Стрибків %c: %d, %c Прапори %c: %Q, %c Відійшов "
+"Відповідь WHO від %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %c Канал %c: \r!c\r%Q\r, "
+"%c Сервер %c: \r!s\r%Q\r, %c Стрибків %c: %d, %c Прапори %c: %Q, %c Відійшов "
 "%c: %Q,  %c Реальне ім'я %c: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:797
@@ -5797,8 +5797,8 @@ msgid ""
 msgstr "Сервер відхиляє вхід по всім нікам, ви повинні послати Нік вручну"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:871
-msgid "No way to login as '!n%Q' (%d: %Q), trying '%Q'..."
-msgstr "Неможливо ввійти під ніком '!n%Q' (%d: %Q), пробую '%Q'..."
+msgid "No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."
+msgstr "Неможливо ввійти під ніком '\r!n\r%Q\r' (%d: %Q), пробую '%Q'..."
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:945
 msgid "Command syntax %Q: %Q"
@@ -5820,62 +5820,62 @@ msgid "End of help about %Q"
 msgstr "Кінець WHO списку для %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1037
-msgid "%c!n%Q%c is away: %Q"
-msgstr "%c!n%Q%c відійшов: %Q"
+msgid "%c\r!n\r%Q\r%c is away: %Q"
+msgstr "%c\r!n\r%Q\r%c відійшов: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1090
 #, fuzzy
-msgid "%c!n%Q%c is %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c є %c!n%Q! %Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c is %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c є %c\r!n\r%Q\r! %Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1095
-msgid "%c!n%Q%c's real name: %Q"
-msgstr "%c!n%Q%c реальне ім'я: %Q"
+msgid "%c\r!n\r%Q\r%c's real name: %Q"
+msgstr "%c\r!n\r%Q\r%c реальне ім'я: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1115
 #, fuzzy
-msgid "%c!n%Q%c was %c!n%Q!%Q@!h%Q%c"
-msgstr "%c!n%Q%c був %c!n%Q! %Q@!h%Q%c"
+msgid "%c\r!n\r%Q\r%c was %c\r!n\r%Q\r!%Q@\r!h\r%Q\r%c"
+msgstr "%c\r!n\r%Q\r%c був %c\r!n\r%Q\r! %Q@\r!h\r%Q\r%c"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1119
-msgid "%c!n%Q%c's real name was: %Q"
-msgstr "%c!n%Q%c було реальне ім'я: %Q"
+msgid "%c\r!n\r%Q\r%c's real name was: %Q"
+msgstr "%c\r!n\r%Q\r%c було реальне ім'я: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1183
-msgid "%c!n%Q%c's channels: %Q"
-msgstr "%c!n%Q%c канали: %Q"
+msgid "%c\r!n\r%Q\r%c's channels: %Q"
+msgstr "%c\r!n\r%Q\r%c канали: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1220
 msgid "Received a broken RPL_WHOISIDLE, can't evaluate the idle time"
 msgstr "Отриманий битий RPL_WHOISIDLE, не можу визначити час простою"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1230
-msgid "%c!n%Q%c's idle time: %ud %uh %um %us"
-msgstr "%c!n%Q%c час простою: %u д %u год %u м %u з"
+msgid "%c\r!n\r%Q\r%c's idle time: %ud %uh %um %us"
+msgstr "%c\r!n\r%Q\r%c час простою: %u д %u год %u м %u з"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1240
-msgid "%c!n%Q%c's signon time: %Q"
-msgstr "%c!n%Q%c час авторизації: %Q"
+msgid "%c\r!n\r%Q\r%c's signon time: %Q"
+msgstr "%c\r!n\r%Q\r%c час авторизації: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1274
-msgid "%c!n%Q%c's server: !s%Q - %Q"
-msgstr "%c!n%Q%c сервер: !s%Q - %Q"
+msgid "%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"
+msgstr "%c\r!n\r%Q\r%c сервер: \r!s\r%Q\r - %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1293
-msgid "%c!n%Q%c is authenticated as %Q"
-msgstr "%c!n%Q%c ідентифікований як: %Q"
+msgid "%c\r!n\r%Q\r%c is authenticated as %Q"
+msgstr "%c\r!n\r%Q\r%c ідентифікований як: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1325
-msgid "%c!n%Q%c's info: %Q"
-msgstr "%c!n%Q%c інформація: %Q"
+msgid "%c\r!n\r%Q\r%c's info: %Q"
+msgstr "%c\r!n\r%Q\r%c інформація: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1372
-msgid "%c!n%Q%c WHOIS info from !s%Q"
-msgstr "%c!n%Q%c WHOIS інформація від !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOIS інформація від \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1389
-msgid "%c!n%Q%c WHOWAS info from !s%Q"
-msgstr "%c!n%Q%c WHOWAS інформація від !s%Q"
+msgid "%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"
+msgstr "%c\r!n\r%Q\r%c WHOWAS інформація від \r!s\r%Q\r"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1457
 msgid "Can't evaluate creation time"
@@ -5886,8 +5886,8 @@ msgid "Channel was created at %Q"
 msgstr "Канал створений %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1470
-msgid "Channel !c%Q was created at %Q"
-msgstr "Канал !c%Q створений %Q"
+msgid "Channel \r!c\r%Q\r was created at %Q"
+msgstr "Канал \r!c\r%Q\r створений %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1511
 msgid "USERHOST info: %Q"
@@ -5935,37 +5935,37 @@ msgstr "Установка ніка в режимі Відійшов (%Q)"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1762
 #, c-format
-msgid "%c!s%s%c's server info: %s"
-msgstr "%c!s%s%c інформація про сервер: %s"
+msgid "%c\r!s\r%s\r%c's server info: %s"
+msgstr "%c\r!s\r%s\r%c інформація про сервер: %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1773
 #, c-format
-msgid "%c!s%s%c's administrator is %s"
-msgstr "%c!s%s%c адміністратор %s"
+msgid "%c\r!s\r%s\r%c's administrator is %s"
+msgstr "%c\r!s\r%s\r%c адміністратор %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1784
 #, c-format
-msgid "%c!s%s%c's contact adress is %s"
-msgstr "%c!s%s%c контактна адреса %s"
+msgid "%c\r!s\r%s\r%c's contact adress is %s"
+msgstr "%c\r!s\r%s\r%c контактна адреса %s"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1809
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1812
-msgid "!n%Q invited %Q into channel %Q"
-msgstr "!n%Q запрошує %Q на канал %Q"
+msgid "\r!n\r%Q\r invited %Q into channel %Q"
+msgstr "\r!n\r%Q\r запрошує %Q на канал %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1834
 #, c-format
-msgid "%c!s%s%c's information:"
-msgstr "%c!s%s%c's інформація:"
+msgid "%c\r!s\r%s\r%c's information:"
+msgstr "%c\r!s\r%s\r%c's інформація:"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1844
 #, c-format
-msgid "End of %c!s%s%c's information"
-msgstr "Кінець %c!s%s%c's інформації"
+msgid "End of %c\r!s\r%s\r%c's information"
+msgstr "Кінець %c\r!s\r%s\r%c's інформації"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1855
-msgid "%c!s%s%c's time is %Q"
-msgstr "%c!s%s%c's час %Q"
+msgid "%c\r!s\r%s\r%c's time is %Q"
+msgstr "%c\r!s\r%s\r%c's час %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1866
 msgid "%Q: no such server"
@@ -5997,8 +5997,8 @@ msgid "Your encoding is now %Q"
 msgstr "Використовуване кодування %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1967
-msgid "%c!n%Q%c's codepage is %Q: %Q"
-msgstr "%c!n%Q%c використає кодування %Q: %Q"
+msgid "%c\r!n\r%Q\r%c's codepage is %Q: %Q"
+msgstr "%c\r!n\r%Q\r%c використає кодування %Q: %Q"
 
 #: src/kvirc/sparser/kvi_sp_numeric.cpp:1991
 #, c-format
@@ -7241,19 +7241,19 @@ msgstr "Загальні канали: %2"
 
 #: src/kvirc/ui/kvi_query.cpp:316
 msgid ""
-"The target of this query has changed from !n%Q [%Q@!h%Q] to !n"
-"%Q [%Q@!h%Q]"
+"The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n"
+"\r%Q\r [%Q@\r!h\r%Q\r]"
 msgstr ""
-"Ціль привата змінена з !n%Q [%Q@!h%Q] на !n%Q [%Q@!h%Q"
-"]"
+"Ціль привата змінена з \r!n\r%Q\r [%Q@\r!h\r%Q\r] на \r!n\r%Q\r [%Q@\r!h\r%Q"
+"\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:385
-msgid "Common channels for !n%Q [%Q@!h%Q]: %Q"
-msgstr "Загальні канали для !n%Q [%Q@!h%Q]: %Q"
+msgid "Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
+msgstr "Загальні канали для \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"
 
 #: src/kvirc/ui/kvi_query.cpp:388
-msgid "No common channels for !n%Q [%Q@!h%Q]"
-msgstr "Немає загальних каналів для !n%Q [%Q@!h%Q]"
+msgid "No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
+msgstr "Немає загальних каналів для \r!n\r%Q\r [%Q@\r!h\r%Q\r]"
 
 #: src/kvirc/ui/kvi_query.cpp:424
 msgid "[Dead query]"
-- 
cgit v1.2.3

