diff --git a/po/cs.po b/po/cs.po
index e294d59..348ea2a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2866,12 +2866,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
 
 #, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "%s: server %s%s%s byl zkopírován do %s%s"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "%s: server %s%s%s byl zkopírován do %s%s%s"
 
 #, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "%s: server %s%s%s byl přejmenován na %s%s"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "%s: server %s%s%s byl přejmenován na %s%s%s"
 
 #, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -4096,8 +4096,8 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: tenhle buffer není kanál!"
 
 #, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "%sByl jsi pozván na %s%s%s od %s%s"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "%sByl jsi pozván na %s%s%s od %s%s%s"
 
 #, c-format
 msgid "%s%s: cannot create new channel \"%s\""
@@ -4112,36 +4112,36 @@ msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s%s: kanál \"%s\" nebyl nalezen příkazem \"%s\""
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
-msgstr "%s%s%s%s byl vykopnut %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
+msgstr "%s%s%s%s byl vykopnut %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s"
-msgstr "%s%s%s%s byl vykopnut %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
+msgstr "%s%s%s%s byl vykopnut %s%s%s"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
-msgstr "%s%sByl jste zabit uživatelem %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
+msgstr "%s%sByl jste zabit uživatelem %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s"
-msgstr "%s%sByl jste zabit uživatelem %s%s"
+msgid "%s%sYou were killed by %s%s%s"
+msgstr "%s%sByl jste zabit uživatelem %s%s%s"
 
 #, c-format
-msgid "%sMode %s%s %s[%s%s%s]%s by %s%s"
-msgstr "%sMód %s%s %s[%s%s%s]%s od %s%s"
+msgid "%sMode %s%s %s[%s%s%s]%s by %s%s%s"
+msgstr "%sMód %s%s %s[%s%s%s]%s od %s%s%s"
 
 #, c-format
 msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "%sUživatelský mód %s[%s%s%s]%s od %s%s"
 
 #, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "%sNyní známý jako %s%s"
+msgid "%sYou are now known as %s%s%s"
+msgstr "%sNyní známý jako %s%s%s"
 
 #, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s%s je nyní známý jako %s%s"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s%s je nyní známý jako %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -4156,8 +4156,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "%sNeznámý CTCP %s%s%s obdržen od %s%s%s: %s"
 
 #, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "%sNeznámý CTCP %s%s%s obdržen od %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "%sNeznámý CTCP %s%s%s obdržen od %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4180,8 +4180,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s%s zrušil téma pro %s%s"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s%s zrušil téma pro %s%s%s"
 
 #, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4259,8 +4259,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "%sTéma pro %s%s%s nastevil %s%s%s v %s"
 
 #, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s%s pozval %s%s%s na %s%s"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s%s pozval %s%s%s na %s%s%s"
 
 #, c-format
 msgid "%sChannel reop %s%s%s: %s%s"
diff --git a/po/de.po b/po/de.po
index 5c39e7f..d05b290 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2721,12 +2721,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s%s: Server \"%s\" für den Befehl \"%s\" existiert bereits"
 
 #, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "%s: Server %s%s%s wurde nach %s%s kopiert"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "%s: Server %s%s%s wurde nach %s%s%s kopiert"
 
 #, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "%s: Server %s%s%s wurde in %s%s umbenannt"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "%s: Server %s%s%s wurde in %s%s%s umbenannt"
 
 #, fuzzy, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -3927,36 +3927,36 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: Dieser Puffer ist kein Channel!"
 
 #, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "%sSie wurden in den Channel %s%s%s von %s%s eingeladen"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "%sSie wurden in den Channel %s%s%s von %s%s%s eingeladen"
 
 #, c-format
 msgid "%s%s: cannot create new channel \"%s\""
 msgstr "%s%s: konnte den neuen Channel \"%s\" nicht erzeugen"
 
 #, c-format
-msgid "%s%s%s %s(%s%s%s)%s has joined %s%s"
-msgstr "%s%s%s %s(%s%s%s)%s ist in den Channel %s%s gekommen"
+msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s"
+msgstr "%s%s%s %s(%s%s%s)%s ist in den Channel %s%s%s gekommen"
 
 #, c-format
 msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s%s: Channel \"%s\" für den \"%s\"-Befehl nicht gefunden"
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
-msgstr "%s%s%s%s hat %s%s aus %s(%s%s%s) gekickt"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
+msgstr "%s%s%s%s hat %s%s%s gekickt %s(%s%s%s)"
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s"
-msgstr "%s%s%s%s hat %s%s gekickt"
+msgid "%s%s%s%s has kicked %s%s%s"
+msgstr "%s%s%s%s hat %s%s%s gekickt"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
-msgstr "%s%sDu wurdest durch %s%s %s(%s%s%s) gekillt"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
+msgstr "%s%sDu wurdest durch %s%s%s gekillt %s(%s%s%s)"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s"
-msgstr "%s%sDu wurdest durch %s%s gekillt"
+msgid "%s%sYou were killed by %s%s%s"
+msgstr "%s%sDu wurdest durch %s%s%s gekillt"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]%s by %s%s"
@@ -3967,12 +3967,12 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "%sUsermodus %s[%s%s%s]%s by %s%s"
 
 #, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "%sSie sind nun als %s%s bekannt"
+msgid "%sYou are now known as %s%s%s"
+msgstr "%sSie sind nun als %s%s%s bekannt"
 
 #, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s%s ist nun als %s%s bekannt"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s%s ist nun als %s%s%s bekannt"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -3987,8 +3987,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "%sUnbekannter CTCP %s%s%s empfangen von %s%s%s : %s"
 
 #, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "%sUnbekannter CTCP %s%s%s von %s%s empfangen"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "%sUnbekannter CTCP %s%s%s von %s%s%s empfangen"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4011,8 +4011,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s setzte das Topic für %s%s%s auf: \"%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s%s hat das Topic von %s%s entfernt"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s%s hat das Topic von %s%s%s entfernt"
 
 #, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4087,8 +4087,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "%sTopic für %s%s%s gesetzt von %s%s%s, %s"
 
 #, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s%s hat %s%s%s in den Channel %s%s eingeladen"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s%s hat %s%s%s in den Channel %s%s%s eingeladen"
 
 #, c-format
 msgid "%sChannel reop %s%s%s: %s%s"
diff --git a/po/es.po b/po/es.po
index 2eb6e88..54e9a46 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2675,12 +2675,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s%s: ya existe el servidor \"%s\" para el comando \"%s\""
 
 #, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "%s: servidor %s%s%s copiado a %s%s"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "%s: servidor %s%s%s copiado a %s%s%s"
 
 #, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "%s: servidor %s%s%s renombrado como %s%s"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "%s: servidor %s%s%s renombrado como %s%s%s"
 
 #, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -3922,8 +3922,8 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: ¡este buffer no es un canal!"
 
 #, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "%sUsted ha sido invitado a %s%s%s por %s%s"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "%sUsted ha sido invitado a %s%s%s por %s%s%s"
 
 #, c-format
 msgid "%s%s: cannot create new channel \"%s\""
@@ -3938,20 +3938,20 @@ msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s%s: canal \"%s\" no encontrado para el comando \"%s\""
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
-msgstr "%s%s%s%s ha expulsado %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
+msgstr "%s%s%s%s ha expulsado %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s"
-msgstr "%s%s%s%s ha expulsado %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
+msgstr "%s%s%s%s ha expulsado %s%s%s"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
-msgstr "%s%sFuiste expulsado por %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
+msgstr "%s%sFuiste expulsado por %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s"
-msgstr "%s%sFuiste expulsado por %s%s"
+msgid "%s%sYou were killed by %s%s%s"
+msgstr "%s%sFuiste expulsado por %s%s%s"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]%s by %s%s"
@@ -3962,12 +3962,12 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "%sModo de usuario %s[%s%s%s]%s por %s%s"
 
 #, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "%sEres conocido ahora como %s%s"
+msgid "%sYou are now known as %s%s%s"
+msgstr "%sEres conocido ahora como %s%s%s"
 
 #, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s%s es conocido ahora como %s%s"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s%s es conocido ahora como %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -3982,8 +3982,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "%sCTCP desconocido %s%s%s recibido de %s%s%s: %s"
 
 #, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "%sCTCP desconocido %s%s%s recibido de %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "%sCTCP desconocido %s%s%s recibido de %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4006,8 +4006,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s%s ha borrado el tema para %s%s"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s%s ha borrado el tema para %s%s%s"
 
 #, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4083,8 +4083,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "%sTema para %s%s%s establecido por %s%s%s el %s"
 
 #, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s%s ha invitado a %s%s%s a %s%s"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s%s ha invitado a %s%s%s a %s%s%s"
 
 # dunno what reop means
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 0634cc4..877e9ec 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2935,12 +2935,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s%s: le serveur \"%s\" existe déjà pour la commande \"%s\""
 
 #, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "%s: le serveur %s%s%s a été copié vers %s%s"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "%s: le serveur %s%s%s a été copié vers %s%s%s"
 
 #, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "%s: le serveur %s%s%s a été renommé en %s%s"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "%s: le serveur %s%s%s a été renommé en %s%s%s"
 
 #, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -4189,36 +4189,36 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: ce tampon n'est pas un canal !"
 
 #, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "%sVous avez été invité sur %s%s%s par %s%s"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "%sVous avez été invité sur %s%s%s par %s%s%s"
 
 #, c-format
 msgid "%s%s: cannot create new channel \"%s\""
 msgstr "%s%s: impossible de créer le nouveau canal \"%s\""
 
 #, c-format
-msgid "%s%s%s %s(%s%s%s)%s has joined %s%s"
-msgstr "%s%s%s %s(%s%s%s)%s a rejoint %s%s"
+msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s"
+msgstr "%s%s%s %s(%s%s%s)%s a rejoint %s%s%s"
 
 #, c-format
 msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s%s: canal \"%s\" non trouvé pour la commande \"%s\""
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
-msgstr "%s%s%s%s a expulsé %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
+msgstr "%s%s%s%s a expulsé %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s"
-msgstr "%s%s%s%s a expulsé %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
+msgstr "%s%s%s%s a expulsé %s%s%s"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
-msgstr "%s%sVous avez été tué par %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
+msgstr "%s%sVous avez été tué par %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s"
-msgstr "%s%sVous avez été tué par %s%s"
+msgid "%s%sYou were killed by %s%s%s"
+msgstr "%s%sVous avez été tué par %s%s%s"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]%s by %s%s"
@@ -4229,12 +4229,12 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "%sMode utilisateur %s[%s%s%s]%s par %s%s"
 
 #, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "%sVous êtes maintenant connu sous le nom %s%s"
+msgid "%sYou are now known as %s%s%s"
+msgstr "%sVous êtes maintenant connu sous le nom %s%s%s"
 
 #, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s%s est maintenant connu sous le nom %s%s"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s%s est maintenant connu sous le nom %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -4249,8 +4249,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "%sCTCP inconnu %s%s%s reçu de %s%s%s: %s"
 
 #, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "%sCTCP inconnu %s%s%s reçu de %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "%sCTCP inconnu %s%s%s reçu de %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4273,8 +4273,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s a changé le titre pour %s%s%s en \"%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s%s a retiré le titre pour %s%s"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s%s a retiré le titre pour %s%s%s"
 
 #, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4350,8 +4350,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "%sTitre pour %s%s%s défini par %s%s%s le %s"
 
 #, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s%s a invité %s%s%s sur %s%s"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s%s a invité %s%s%s sur %s%s%s"
 
 #, c-format
 msgid "%sChannel reop %s%s%s: %s%s"
diff --git a/po/hu.po b/po/hu.po
index 3f5205b..9097baf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2791,12 +2791,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s a \"%s\" szerver már létezik a(z) \"%s\" parancshoz\n"
 
 #, fuzzy, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "A %s%s%s szerver másolva lett %s%s néven\n"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "A %s%s%s szerver másolva lett %s%s%s néven\n"
 
 #, fuzzy, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "A %s%s%s szerver mostantól: %s%s\n"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "A %s%s%s szerver mostantól: %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -4051,35 +4051,35 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "Ez az ablak nem egy szoba!\n"
 
 #, fuzzy, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "Meghívást kapott a %s%s%s szobába %s%s felhasználótól\n"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "Meghívást kapott a %s%s%s szobába %s%s%s felhasználótól\n"
 
 #, fuzzy, c-format
 msgid "%s%s: cannot create new channel \"%s\""
 msgstr "%s nem sikerült új szobát nyitni \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s %s(%s%s%s)%s has joined %s%s"
-msgstr "%s%s %s(%s%s%s)%s belépett a(z) %s%s szobába\n"
+msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s"
+msgstr "%s%s %s(%s%s%s)%s belépett a(z) %s%s%s szobába\n"
 
 #, fuzzy, c-format
 msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
 msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has kicked %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
 msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
 
 #, fuzzy, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
 msgstr "%s%s%s eltávolította %s%s%s-t a szerverről"
 
 #, fuzzy, c-format
-msgid "%s%sYou were killed by %s%s"
+msgid "%s%sYou were killed by %s%s%s"
 msgstr "Az új neved: %s%s\n"
 
 #, fuzzy, c-format
@@ -4091,12 +4091,12 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "A %s[%s%s%s]%s felhasználói üzemmódot bekapcsolta: %s%s\n"
 
 #, fuzzy, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "Az új neved: %s%s\n"
+msgid "%sYou are now known as %s%s%s"
+msgstr "Az új neved: %s%s%s\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s mostantól: %s%s\n"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s mostantól: %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -4111,8 +4111,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
 
 #, fuzzy, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s%s"
 
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4135,8 +4135,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s törölte a %s%s szoba témáját\n"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s törölte a %s%s%s szoba témáját\n"
 
 #, fuzzy, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4210,8 +4210,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "A témát beállította: %s%s%s, %s"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s meghívta %s%s%s-t %s%s%s-kor\n"
 
 #, fuzzy, c-format
 msgid "%sChannel reop %s%s%s: %s%s"
diff --git a/po/pl.po b/po/pl.po
index ce4a3ab..99c61cb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2903,12 +2903,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s%s: serwer \"%s\" już istnieje dla komendy \"%s\""
 
 #, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "%s: serwer %s%s%s został skopiowany do %s%s"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "%s: serwer %s%s%s został skopiowany do %s%s%s"
 
 #, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "%s: zmieniono nazwę serwera  %s%s%s na %s%s"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "%s: zmieniono nazwę serwera  %s%s%s na %s%s%s"
 
 #, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -4139,36 +4139,36 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "%s%s: to nie jest bufor kanału"
 
 #, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "%sZostałeś zaproszony na %s%s%s przez %s%s"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "%sZostałeś zaproszony na %s%s%s przez %s%s%s"
 
 #, c-format
 msgid "%s%s: cannot create new channel \"%s\""
 msgstr "%s%s: nie można utworzyć nowego kanału \"%s\""
 
 #, c-format
-msgid "%s%s%s %s(%s%s%s)%s has joined %s%s"
-msgstr "%s%s%s %s(%s%s%s)%s wszedł na %s%s"
+msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s"
+msgstr "%s%s%s %s(%s%s%s)%s wszedł na %s%s%s"
 
 #, c-format
 msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s%s: nie znaleziono kanału \"%s\" dla komendy \"%s\" "
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
-msgstr "%s%s%s%s wykopał %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
+msgstr "%s%s%s%s wykopał %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s"
-msgstr "%s%s%s%s wykopał %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
+msgstr "%s%s%s%s wykopał %s%s%s"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
-msgstr "%s%sZostałeś zabity przez %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
+msgstr "%s%sZostałeś zabity przez %s%s%s %s(%s%s%s)"
 
 #, c-format
-msgid "%s%sYou were killed by %s%s"
-msgstr "%s%sZostałeś zabity przez %s%s"
+msgid "%s%sYou were killed by %s%s%s"
+msgstr "%s%sZostałeś zabity przez %s%s%s"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]%s by %s%s"
@@ -4179,12 +4179,12 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "%sTryb użytkownika %s[%s%s%s]%s ustawiony przez %s%s"
 
 #, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "%sJesteś od teraz %s%s"
+msgid "%sYou are now known as %s%s%s"
+msgstr "%sJesteś od teraz %s%s%s"
 
 #, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s%s zmienił nick na %s%s"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s%s zmienił nick na %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -4199,8 +4199,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "%sNieznane CTCP %s%s%s otrzymano od %s%s%s: %s"
 
 #, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "%sNieznane CTCP %s%s%s otrzymano od %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "%sNieznane CTCP %s%s%s otrzymano od %s%s%s"
 
 #, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4223,8 +4223,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s zmienił temat %s%s%s na \"%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s%s usunął temat %s%s"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s%s usunął temat %s%s%s"
 
 #, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4302,8 +4302,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "%sTemat kanału %s%s%s ustawiony przez %s%s%s dnia %s"
 
 #, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s%s zaprosił %s%s%s na %s%s"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s%s zaprosił %s%s%s na %s%s%s"
 
 #, c-format
 msgid "%sChannel reop %s%s%s: %s%s"
diff --git a/po/ru.po b/po/ru.po
index 640dc0b..0c4a176 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2795,12 +2795,12 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr "%s сервер \"%s\" уже существует для команды \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
-msgstr "Сервер %s%s%s скопирован в %s%s\n"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgstr "Сервер %s%s%s скопирован в %s%s%s\n"
 
 #, fuzzy, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
-msgstr "Сервер %s%s%s переименован в %s%s\n"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
+msgstr "Сервер %s%s%s переименован в %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%s%s: server \"%s\" is not a temporary server"
@@ -4043,35 +4043,35 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr "Это окно не является каналом!\n"
 
 #, fuzzy, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
-msgstr "Вас пригласил на %s%s%s пользователь %s%s\n"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
+msgstr "Вас пригласил на %s%s%s пользователь %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%s%s: cannot create new channel \"%s\""
 msgstr "%s не могу создать новый канал \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s %s(%s%s%s)%s has joined %s%s"
-msgstr "%s%s %s(%s%s%s)%s зашёл на канал %s%s\n"
+msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s"
+msgstr "%s%s %s(%s%s%s)%s зашёл на канал %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr "%s канал \"%s\" не найден для команды \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
 msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has kicked %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
 msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
 
 #, fuzzy, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
 msgstr "%s%s%s убил %s%s%s"
 
 #, fuzzy, c-format
-msgid "%s%sYou were killed by %s%s"
+msgid "%s%sYou were killed by %s%s%s"
 msgstr "Теперь вы известны как %s%s\n"
 
 #, fuzzy, c-format
@@ -4083,12 +4083,12 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "Режим %s[%s%s%s]%s пользователем %s%s\n"
 
 #, fuzzy, c-format
-msgid "%sYou are now known as %s%s"
-msgstr "Теперь вы известны как %s%s\n"
+msgid "%sYou are now known as %s%s%s"
+msgstr "Теперь вы известны как %s%s%s\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s is now known as %s%s"
-msgstr "%s%s%s теперь известен как %s%s\n"
+msgid "%s%s%s%s is now known as %s%s%s"
+msgstr "%s%s%s теперь известен как %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
@@ -4103,8 +4103,8 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
 
 #, fuzzy, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
-msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
+msgstr "Получен неизвестный CTCP %s%s%s от %s%s%s"
 
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)"
@@ -4127,8 +4127,8 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s сменил тему %s%s%s на:"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
-msgstr "%s%s%s удалил тему канала для %s%s\n"
+msgid "%s%s%s%s has unset topic for %s%s%s"
+msgstr "%s%s%s удалил тему канала для %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -4202,8 +4202,8 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr "Тема установлена пользователем %s%s%s, %s"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
-msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
+msgstr "%s%s%s пригласил %s%s%s на канал %s%s%s\n"
 
 #, fuzzy, c-format
 msgid "%sChannel reop %s%s%s: %s%s"
diff --git a/po/weechat.pot b/po/weechat.pot
index 8528ff4..e822a28 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -2434,11 +2434,11 @@ msgid "%s%s: server \"%s\" already exists for \"%s\" command"
 msgstr ""
 
 #, c-format
-msgid "%s: server %s%s%s has been copied to %s%s"
+msgid "%s: server %s%s%s has been copied to %s%s%s"
 msgstr ""
 
 #, c-format
-msgid "%s: server %s%s%s has been renamed to %s%s"
+msgid "%s: server %s%s%s has been renamed to %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3449,7 +3449,7 @@ msgid "%s%s: this buffer is not a channel!"
 msgstr ""
 
 #, c-format
-msgid "%sYou have been invited to %s%s%s by %s%s"
+msgid "%sYou have been invited to %s%s%s by %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3457,7 +3457,7 @@ msgid "%s%s: cannot create new channel \"%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s%s %s(%s%s%s)%s has joined %s%s"
+msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3465,19 +3465,19 @@ msgid "%s%s: channel \"%s\" not found for \"%s\" command"
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s %s(%s%s%s)"
+msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)"
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has kicked %s%s"
+msgid "%s%s%s%s has kicked %s%s%s"
 msgstr ""
 
 #, c-format
-msgid "%s%sYou were killed by %s%s %s(%s%s%s)"
+msgid "%s%sYou were killed by %s%s%s %s(%s%s%s)"
 msgstr ""
 
 #, c-format
-msgid "%s%sYou were killed by %s%s"
+msgid "%s%sYou were killed by %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3489,11 +3489,11 @@ msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr ""
 
 #, c-format
-msgid "%sYou are now known as %s%s"
+msgid "%sYou are now known as %s%s%s"
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s is now known as %s%s"
+msgid "%s%s%s%s is now known as %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3509,7 +3509,7 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s"
 msgstr ""
 
 #, c-format
-msgid "%sUnknown CTCP %s%s%s received from %s%s"
+msgid "%sUnknown CTCP %s%s%s received from %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3533,7 +3533,7 @@ msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s"
+msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr ""
 
 #, c-format
@@ -3606,11 +3606,11 @@ msgid "%sTopic for %s%s%s set by %s%s%s on %s"
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has invited %s%s%s to %s%s"
+msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
 msgstr ""
 
 #, c-format
-msgid "%sChannel reop %s%s%s: %s%s"
+msgid "%sChannel reop %s%s%s: %s%s%s"
 msgstr ""
 
 #, c-format
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index f570e11..e138b33 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -2918,13 +2918,14 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
         {
             weechat_printf (NULL,
                             _("%s: server %s%s%s has been copied to "
-                              "%s%s"),
+                              "%s%s%s"),
                             IRC_PLUGIN_NAME,
                             IRC_COLOR_CHAT_SERVER,
                             argv[2],
                             IRC_COLOR_CHAT,
                             IRC_COLOR_CHAT_SERVER,
-                            argv[3]);
+                            argv[3],
+                            IRC_COLOR_CHAT);
             return WEECHAT_RC_OK;
         }
         
@@ -2966,13 +2967,14 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
         {
             weechat_printf (NULL,
                             _("%s: server %s%s%s has been renamed to "
-                              "%s%s"),
+                              "%s%s%s"),
                             IRC_PLUGIN_NAME,
                             IRC_COLOR_CHAT_SERVER,
                             argv[2],
                             IRC_COLOR_CHAT,
                             IRC_COLOR_CHAT_SERVER,
-                            argv[3]);
+                            argv[3],
+                            IRC_COLOR_CHAT);
             return WEECHAT_RC_OK;
         }
         
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index a32d92e..e261fc4 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -292,13 +292,14 @@ irc_protocol_cmd_invite (struct t_irc_server *server, const char *command,
         weechat_printf_tags (server->buffer,
                              irc_protocol_tags (command, "notify_highlight"),
                              _("%sYou have been invited to %s%s%s by "
-                               "%s%s"),
+                               "%s%s%s"),
                              weechat_prefix ("network"),
                              IRC_COLOR_CHAT_CHANNEL,
                              (argv[3][0] == ':') ? argv[3] + 1 : argv[3],
                              IRC_COLOR_CHAT,
                              IRC_COLOR_CHAT_NICK,
-                             nick);
+                             nick,
+                             IRC_COLOR_CHAT);
     }
     return WEECHAT_RC_OK;
 }
@@ -369,7 +370,7 @@ irc_protocol_cmd_join (struct t_irc_server *server, const char *command,
                                                  || !weechat_config_boolean (irc_config_look_smart_filter)
                                                  || ptr_nick_speaking) ?
                                                 NULL : "irc_smart_filter"),
-                             _("%s%s%s %s(%s%s%s)%s has joined %s%s"),
+                             _("%s%s%s %s(%s%s%s)%s has joined %s%s%s"),
                              weechat_prefix ("join"),
                              IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                              nick,
@@ -379,7 +380,8 @@ irc_protocol_cmd_join (struct t_irc_server *server, const char *command,
                              IRC_COLOR_CHAT_DELIMITERS,
                              IRC_COLOR_MESSAGE_JOIN,
                              IRC_COLOR_CHAT_CHANNEL,
-                             pos_channel);
+                             pos_channel,
+                             IRC_COLOR_MESSAGE_JOIN);
     }
     
     return WEECHAT_RC_OK;
@@ -428,13 +430,14 @@ irc_protocol_cmd_kick (struct t_irc_server *server, const char *command,
         {
             weechat_printf_tags (ptr_channel->buffer,
                                  irc_protocol_tags (command, NULL),
-                                 _("%s%s%s%s has kicked %s%s %s(%s%s%s)"),
+                                 _("%s%s%s%s has kicked %s%s%s %s(%s%s%s)"),
                                  weechat_prefix ("quit"),
                                  IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                  nick,
                                  IRC_COLOR_MESSAGE_QUIT,
                                  IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick_kicked),
                                  argv[3],
+                                 IRC_COLOR_MESSAGE_QUIT,
                                  IRC_COLOR_CHAT_DELIMITERS,
                                  IRC_COLOR_CHAT,
                                  pos_comment,
@@ -444,13 +447,14 @@ irc_protocol_cmd_kick (struct t_irc_server *server, const char *command,
         {
             weechat_printf_tags (ptr_channel->buffer,
                                  irc_protocol_tags (command, NULL),
-                                 _("%s%s%s%s has kicked %s%s"),
+                                 _("%s%s%s%s has kicked %s%s%s"),
                                  weechat_prefix ("quit"),
                                  IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                  nick,
                                  IRC_COLOR_MESSAGE_QUIT,
                                  IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick_kicked),
-                                 argv[3]);
+                                 argv[3],
+                                 IRC_COLOR_MESSAGE_QUIT);
         }
     }
     
@@ -508,11 +512,12 @@ irc_protocol_cmd_kill (struct t_irc_server *server, const char *command,
             {
                 weechat_printf_tags (ptr_channel->buffer,
                                      irc_protocol_tags (command, NULL),
-                                     _("%s%sYou were killed by %s%s %s(%s%s%s)"),
+                                     _("%s%sYou were killed by %s%s%s %s(%s%s%s)"),
                                      weechat_prefix ("quit"),
                                      IRC_COLOR_MESSAGE_QUIT,
                                      IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                      nick,
+                                     IRC_COLOR_MESSAGE_QUIT,
                                      IRC_COLOR_CHAT_DELIMITERS,
                                      IRC_COLOR_CHAT,
                                      pos_comment,
@@ -522,11 +527,12 @@ irc_protocol_cmd_kill (struct t_irc_server *server, const char *command,
             {
                 weechat_printf_tags (ptr_channel->buffer,
                                      irc_protocol_tags (command, NULL),
-                                     _("%s%sYou were killed by %s%s"),
+                                     _("%s%sYou were killed by %s%s%s"),
                                      weechat_prefix ("quit"),
                                      IRC_COLOR_MESSAGE_QUIT,
                                      IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
-                                     nick);
+                                     nick,
+                                     IRC_COLOR_MESSAGE_QUIT);
             }
         }
         
@@ -682,10 +688,11 @@ irc_protocol_cmd_nick (struct t_irc_server *server, const char *command,
                         weechat_printf_tags (ptr_channel->buffer,
                                              irc_protocol_tags (command, NULL),
                                              _("%sYou are now known as "
-                                               "%s%s"),
+                                               "%s%s%s"),
                                              weechat_prefix ("network"),
                                              IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
-                                             new_nick);
+                                             new_nick,
+                                             IRC_COLOR_CHAT);
                     }
                     else
                     {
@@ -694,14 +701,15 @@ irc_protocol_cmd_nick (struct t_irc_server *server, const char *command,
                             weechat_printf_tags (ptr_channel->buffer,
                                                  irc_protocol_tags (command, NULL),
                                                  _("%s%s%s%s is now known as "
-                                                   "%s%s"),
+                                                   "%s%s%s"),
                                                  weechat_prefix ("network"),
                                                  weechat_config_boolean(irc_config_look_color_nicks_in_server_messages) ?
                                                  old_color : IRC_COLOR_CHAT_NICK,
                                                  nick,
                                                  IRC_COLOR_CHAT,
                                                  IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
-                                                 new_nick);
+                                                 new_nick,
+                                                 IRC_COLOR_CHAT);
                         }
                         irc_channel_nick_speaking_rename (ptr_channel,
                                                           nick, new_nick);
@@ -1263,13 +1271,14 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command,
                         weechat_printf_tags (server->buffer,
                                              irc_protocol_tags (command, "irc_ctcp"),
                                              _("%sUnknown CTCP %s%s%s "
-                                               "received from %s%s"),
+                                               "received from %s%s%s"),
                                              weechat_prefix ("network"),
                                              IRC_COLOR_CHAT_CHANNEL,
                                              pos_args,
                                              IRC_COLOR_CHAT,
                                              IRC_COLOR_CHAT_NICK,
-                                             nick);
+                                             nick,
+                                             IRC_COLOR_CHAT);
                     }
                     if (pos_end_01)
                         pos_end_01[0] = '\01';
@@ -1573,13 +1582,14 @@ irc_protocol_cmd_topic (struct t_irc_server *server, const char *command,
         {
             weechat_printf_tags (ptr_buffer,
                                  irc_protocol_tags (command, NULL),
-                                 _("%s%s%s%s has unset topic for %s%s"),
+                                 _("%s%s%s%s has unset topic for %s%s%s"),
                                  weechat_prefix ("network"),
                                  IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                  nick,
                                  IRC_COLOR_CHAT,
                                  IRC_COLOR_CHAT_CHANNEL,
-                                 argv[2]);
+                                 argv[2],
+                                 IRC_COLOR_CHAT);
         }
     }
     
@@ -2666,7 +2676,7 @@ irc_protocol_cmd_341 (struct t_irc_server *server, const char *command,
     
     weechat_printf_tags (server->buffer,
                          irc_protocol_tags (command, "irc_numeric"),
-                         _("%s%s%s%s has invited %s%s%s to %s%s"),
+                         _("%s%s%s%s has invited %s%s%s to %s%s%s"),
                          weechat_prefix ("network"),
                          IRC_COLOR_CHAT_NICK,
                          argv[2],
@@ -2675,7 +2685,8 @@ irc_protocol_cmd_341 (struct t_irc_server *server, const char *command,
                          argv[3],
                          IRC_COLOR_CHAT,
                          IRC_COLOR_CHAT_CHANNEL,
-                         argv[4]);
+                         argv[4],
+                         IRC_COLOR_CHAT);
     
     return WEECHAT_RC_OK;
 }
