Fixed notice command (to server and display when received), fixed display of nick mode changes

10 files changed, 398 insertions, 294 deletions

diff --git a/po/fr.po b/po/fr.po
index f895e01f0..e8d28e1f8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.0.9-pre1\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-12-21 20:51+0100\n"
+"POT-Creation-Date: 2004-12-22 14:28+0100\n"
 "PO-Revision-Date: 2004-12-21 20:51+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu"
 msgid "can't change mode for other users"
 msgstr "impossible de changer le mode pour les autres utilisateurs"
 
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2912
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2934
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1147,37 +1147,37 @@ msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilisation du nom de machine local \"%s\"\n"
 
 #: src/irc/irc-send.c:256 src/irc/irc-send.c:280 src/irc/irc-send.c:380
-#: src/irc/irc-send.c:691 src/irc/irc-send.c:745 src/irc/irc-send.c:1217
+#: src/irc/irc-send.c:691 src/irc/irc-send.c:767 src/irc/irc-send.c:1239
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 "%s la commande \"%s\" peut seulement être exécutée dans une fenêtre de "
 "canal\n"
 
-#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:792
-#: src/irc/irc-send.c:805 src/irc/irc-send.c:1112
+#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:814
+#: src/irc/irc-send.c:827 src/irc/irc-send.c:1134
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n"
 
 #: src/irc/irc-send.c:569 src/irc/irc-send.c:591 src/irc/irc-recv.c:261
-#: src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1030
 #, c-format
 msgid "%s nick not found for \"%s\" command\n"
 msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:640 src/irc/irc-send.c:881 src/irc/irc-recv.c:1168
+#: src/irc/irc-send.c:640 src/irc/irc-send.c:903 src/irc/irc-recv.c:1190
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
 
-#: src/irc/irc-send.c:670 src/common/command.c:1304
+#: src/irc/irc-send.c:670 src/irc/irc-send.c:741 src/common/command.c:1304
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:1190
+#: src/irc/irc-send.c:1212
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilé le %s %s\n"
@@ -1191,8 +1191,8 @@ msgstr "%s impossible de créer le nouveau canal \"%s\"\n"
 msgid " has joined "
 msgstr " a rejoint "
 
-#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:877
-#: src/irc/irc-recv.c:1017 src/irc/irc-recv.c:2412 src/irc/irc-recv.c:2477
+#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:1039 src/irc/irc-recv.c:2434 src/irc/irc-recv.c:2499
 #, c-format
 msgid "%s channel not found for \"%s\" command\n"
 msgstr "%s canal non trouvé pour la commande \"%s\"\n"
@@ -1293,8 +1293,8 @@ msgstr "donne la voix à"
 msgid "removes voice from"
 msgstr "supprime la voix de"
 
-#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:623 src/irc/irc-recv.c:919
-#: src/irc/irc-recv.c:1262
+#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:630 src/irc/irc-recv.c:941
+#: src/irc/irc-recv.c:1284
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s commande \"%s\" reçue sans host\n"
@@ -1304,251 +1304,255 @@ msgstr "%s commande \"%s\" reçue sans host\n"
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n"
 
-#: src/irc/irc-recv.c:661
+#: src/irc/irc-recv.c:607
+msgid "mode changed by"
+msgstr "mode changé par"
+
+#: src/irc/irc-recv.c:668
 msgid "You are "
 msgstr "Vous êtes "
 
-#: src/irc/irc-recv.c:668
+#: src/irc/irc-recv.c:675
 msgid " is "
 msgstr " est "
 
-#: src/irc/irc-recv.c:672
+#: src/irc/irc-recv.c:679
 msgid "now known as "
 msgstr "maintenant connu sous le nom "
 
-#: src/irc/irc-recv.c:725
+#: src/irc/irc-recv.c:734
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:738 src/irc/irc-recv.c:770
+#: src/irc/irc-recv.c:747 src/irc/irc-recv.c:779
 msgid "reply from"
 msgstr "réponse de"
 
-#: src/irc/irc-recv.c:773
+#: src/irc/irc-recv.c:782
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ": %ld.%ld secondes\n"
 
-#: src/irc/irc-recv.c:803
+#: src/irc/irc-recv.c:825
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s commande \"%s\" reçue sans host ou canal\n"
 
-#: src/irc/irc-recv.c:853
+#: src/irc/irc-recv.c:875
 msgid " has left "
 msgstr " a quitté "
 
-#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1194
+#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1216
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Sur %s: * %s %s"
 
-#: src/irc/irc-recv.c:994
+#: src/irc/irc-recv.c:1016
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Sur %s: %s> %s"
 
-#: src/irc/irc-recv.c:1062
+#: src/irc/irc-recv.c:1084
 msgid "Received a "
 msgstr "Reçu un "
 
-#: src/irc/irc-recv.c:1064
+#: src/irc/irc-recv.c:1086
 msgid "CTCP VERSION "
 msgstr "CTCP VERSION "
 
-#: src/irc/irc-recv.c:1066
+#: src/irc/irc-recv.c:1088
 msgid "from"
 msgstr "de"
 
-#: src/irc/irc-recv.c:1101 src/irc/irc-recv.c:1115 src/irc/irc-recv.c:1130
-#: src/irc/irc-recv.c:1145 src/irc/irc-recv.c:1239 src/irc/irc-recv.c:2698
-#: src/irc/irc-recv.c:2738
+#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1137 src/irc/irc-recv.c:1152
+#: src/irc/irc-recv.c:1167 src/irc/irc-recv.c:1261 src/irc/irc-recv.c:2720
+#: src/irc/irc-recv.c:2760
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s impossible d'analyser la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1242
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privé %s> %s"
 
-#: src/irc/irc-recv.c:1294
+#: src/irc/irc-recv.c:1316
 msgid "has quit"
 msgstr "a quitté"
 
-#: src/irc/irc-recv.c:1414
+#: src/irc/irc-recv.c:1436
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s commande \"%s\" reçue sans canal\n"
 
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1464
 msgid " has changed topic for "
 msgstr " a changé le titre pour "
 
-#: src/irc/irc-recv.c:1447
+#: src/irc/irc-recv.c:1469
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr " en: \"%s\"\n"
 
-#: src/irc/irc-recv.c:1453
+#: src/irc/irc-recv.c:1475
 msgid " has unset topic for "
 msgstr " a retiré le titre pour "
 
-#: src/irc/irc-recv.c:1548
+#: src/irc/irc-recv.c:1570
 #, c-format
 msgid " is away: %s\n"
 msgstr " est absent: %s\n"
 
-#: src/irc/irc-recv.c:1622
+#: src/irc/irc-recv.c:1644
 msgid "Users online: "
 msgstr "Utilisateurs en ligne: "
 
-#: src/irc/irc-recv.c:1985
+#: src/irc/irc-recv.c:2007
 msgid "idle: "
 msgstr "inactivité: "
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "day"
 msgstr "jour"
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hours"
 msgstr "heures"
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hour"
 msgstr "heure"
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minutes"
 msgstr "minutes"
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minute"
 msgstr "minute"
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "seconds"
 msgstr "secondes"
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "second"
 msgstr "seconde"
 
-#: src/irc/irc-recv.c:2020
+#: src/irc/irc-recv.c:2042
 msgid "signon at: "
 msgstr "signé le: "
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2130
 msgid "Channels: "
 msgstr "Canaux: "
 
-#: src/irc/irc-recv.c:2359
+#: src/irc/irc-recv.c:2381
 msgid "No topic set for "
 msgstr "Pas de titre défini pour "
 
-#: src/irc/irc-recv.c:2401
+#: src/irc/irc-recv.c:2423
 msgid "Topic for "
 msgstr "Le titre pour "
 
-#: src/irc/irc-recv.c:2405
+#: src/irc/irc-recv.c:2427
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr " est: \"%s\"\n"
 
-#: src/irc/irc-recv.c:2421 src/irc/irc-recv.c:2501
+#: src/irc/irc-recv.c:2443 src/irc/irc-recv.c:2523
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2467
+#: src/irc/irc-recv.c:2489
 msgid "Topic set by "
 msgstr "Titre défini par "
 
-#: src/irc/irc-recv.c:2485
+#: src/irc/irc-recv.c:2507
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2493
+#: src/irc/irc-recv.c:2515
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2622
+#: src/irc/irc-recv.c:2644
 msgid " on "
 msgstr " sur "
 
-#: src/irc/irc-recv.c:2729
+#: src/irc/irc-recv.c:2751
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:2782
+#: src/irc/irc-recv.c:2804
 msgid "Nicks "
 msgstr "Utilisateurs "
 
-#: src/irc/irc-recv.c:2802
+#: src/irc/irc-recv.c:2824
 msgid "Channel "
 msgstr "Canal "
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nicks"
 msgstr "utilisateurs"
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nick"
 msgstr "utilisateur"
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfops"
 msgstr "halfops"
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfop"
 msgstr "halfop"
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:2848
+#: src/irc/irc-recv.c:2870
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:2881
+#: src/irc/irc-recv.c:2903
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd "
 "nom d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:2892
+#: src/irc/irc-recv.c:2914
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom "
 "d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:2901
+#: src/irc/irc-recv.c:2923
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
diff --git a/po/weechat.pot b/po/weechat.pot
index b991cd36e..e2e916e80 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-12-21 20:51+0100\n"
+"POT-Creation-Date: 2004-12-22 14:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 msgid "can't change mode for other users"
 msgstr ""
 
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2912
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2934
 msgid "unknown"
 msgstr ""
 
@@ -1056,34 +1056,34 @@ msgid "%s: using local hostname \"%s\"\n"
 msgstr ""
 
 #: src/irc/irc-send.c:256 src/irc/irc-send.c:280 src/irc/irc-send.c:380
-#: src/irc/irc-send.c:691 src/irc/irc-send.c:745 src/irc/irc-send.c:1217
+#: src/irc/irc-send.c:691 src/irc/irc-send.c:767 src/irc/irc-send.c:1239
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 
-#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:792
-#: src/irc/irc-send.c:805 src/irc/irc-send.c:1112
+#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:814
+#: src/irc/irc-send.c:827 src/irc/irc-send.c:1134
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 
 #: src/irc/irc-send.c:569 src/irc/irc-send.c:591 src/irc/irc-recv.c:261
-#: src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1030
 #, c-format
 msgid "%s nick not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:640 src/irc/irc-send.c:881 src/irc/irc-recv.c:1168
+#: src/irc/irc-send.c:640 src/irc/irc-send.c:903 src/irc/irc-recv.c:1190
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:670 src/common/command.c:1304
+#: src/irc/irc-send.c:670 src/irc/irc-send.c:741 src/common/command.c:1304
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1190
+#: src/irc/irc-send.c:1212
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr ""
@@ -1097,8 +1097,8 @@ msgstr ""
 msgid " has joined "
 msgstr ""
 
-#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:877
-#: src/irc/irc-recv.c:1017 src/irc/irc-recv.c:2412 src/irc/irc-recv.c:2477
+#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:1039 src/irc/irc-recv.c:2434 src/irc/irc-recv.c:2499
 #, c-format
 msgid "%s channel not found for \"%s\" command\n"
 msgstr ""
@@ -1199,8 +1199,8 @@ msgstr ""
 msgid "removes voice from"
 msgstr ""
 
-#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:623 src/irc/irc-recv.c:919
-#: src/irc/irc-recv.c:1262
+#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:630 src/irc/irc-recv.c:941
+#: src/irc/irc-recv.c:1284
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr ""
@@ -1210,246 +1210,250 @@ msgstr ""
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:661
-msgid "You are "
+#: src/irc/irc-recv.c:607
+msgid "mode changed by"
 msgstr ""
 
 #: src/irc/irc-recv.c:668
+msgid "You are "
+msgstr ""
+
+#: src/irc/irc-recv.c:675
 msgid " is "
 msgstr ""
 
-#: src/irc/irc-recv.c:672
+#: src/irc/irc-recv.c:679
 msgid "now known as "
 msgstr ""
 
-#: src/irc/irc-recv.c:725
+#: src/irc/irc-recv.c:734
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:738 src/irc/irc-recv.c:770
+#: src/irc/irc-recv.c:747 src/irc/irc-recv.c:779
 msgid "reply from"
 msgstr ""
 
-#: src/irc/irc-recv.c:773
+#: src/irc/irc-recv.c:782
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:803
+#: src/irc/irc-recv.c:825
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:853
+#: src/irc/irc-recv.c:875
 msgid " has left "
 msgstr ""
 
-#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1194
+#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1216
 #, c-format
 msgid "On %s: * %s %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:994
+#: src/irc/irc-recv.c:1016
 #, c-format
 msgid "On %s: %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1062
+#: src/irc/irc-recv.c:1084
 msgid "Received a "
 msgstr ""
 
-#: src/irc/irc-recv.c:1064
+#: src/irc/irc-recv.c:1086
 msgid "CTCP VERSION "
 msgstr ""
 
-#: src/irc/irc-recv.c:1066
+#: src/irc/irc-recv.c:1088
 msgid "from"
 msgstr ""
 
-#: src/irc/irc-recv.c:1101 src/irc/irc-recv.c:1115 src/irc/irc-recv.c:1130
-#: src/irc/irc-recv.c:1145 src/irc/irc-recv.c:1239 src/irc/irc-recv.c:2698
-#: src/irc/irc-recv.c:2738
+#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1137 src/irc/irc-recv.c:1152
+#: src/irc/irc-recv.c:1167 src/irc/irc-recv.c:1261 src/irc/irc-recv.c:2720
+#: src/irc/irc-recv.c:2760
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1242
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1294
+#: src/irc/irc-recv.c:1316
 msgid "has quit"
 msgstr ""
 
-#: src/irc/irc-recv.c:1414
+#: src/irc/irc-recv.c:1436
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1464
 msgid " has changed topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:1447
+#: src/irc/irc-recv.c:1469
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1453
+#: src/irc/irc-recv.c:1475
 msgid " has unset topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:1548
+#: src/irc/irc-recv.c:1570
 #, c-format
 msgid " is away: %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1622
+#: src/irc/irc-recv.c:1644
 msgid "Users online: "
 msgstr ""
 
-#: src/irc/irc-recv.c:1985
+#: src/irc/irc-recv.c:2007
 msgid "idle: "
 msgstr ""
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "day"
 msgstr ""
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hours"
 msgstr ""
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hour"
 msgstr ""
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minutes"
 msgstr ""
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minute"
 msgstr ""
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "seconds"
 msgstr ""
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "second"
 msgstr ""
 
-#: src/irc/irc-recv.c:2020
+#: src/irc/irc-recv.c:2042
 msgid "signon at: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2130
 msgid "Channels: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2359
+#: src/irc/irc-recv.c:2381
 msgid "No topic set for "
 msgstr ""
 
-#: src/irc/irc-recv.c:2401
+#: src/irc/irc-recv.c:2423
 msgid "Topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:2405
+#: src/irc/irc-recv.c:2427
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2421 src/irc/irc-recv.c:2501
+#: src/irc/irc-recv.c:2443 src/irc/irc-recv.c:2523
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2467
+#: src/irc/irc-recv.c:2489
 msgid "Topic set by "
 msgstr ""
 
-#: src/irc/irc-recv.c:2485
+#: src/irc/irc-recv.c:2507
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2493
+#: src/irc/irc-recv.c:2515
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2622
+#: src/irc/irc-recv.c:2644
 msgid " on "
 msgstr ""
 
-#: src/irc/irc-recv.c:2729
+#: src/irc/irc-recv.c:2751
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2782
+#: src/irc/irc-recv.c:2804
 msgid "Nicks "
 msgstr ""
 
-#: src/irc/irc-recv.c:2802
+#: src/irc/irc-recv.c:2824
 msgid "Channel "
 msgstr ""
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nicks"
 msgstr ""
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nick"
 msgstr ""
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "ops"
 msgstr ""
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "op"
 msgstr ""
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfops"
 msgstr ""
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfop"
 msgstr ""
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voices"
 msgstr ""
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voice"
 msgstr ""
 
-#: src/irc/irc-recv.c:2848
+#: src/irc/irc-recv.c:2870
 msgid "normal"
 msgstr ""
 
-#: src/irc/irc-recv.c:2881
+#: src/irc/irc-recv.c:2903
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2892
+#: src/irc/irc-recv.c:2914
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2901
+#: src/irc/irc-recv.c:2923
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 6fbd005b8..0137257d7 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -142,7 +142,7 @@ t_irc_command irc_commands[] =
     1, 1, 1, irc_cmd_send_nick, NULL, irc_cmd_recv_nick },
   { "notice", N_("send notice message to user"),
     N_("nickname text"), N_("nickname: user to send notice to\ntext: text to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
+    2, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
   { "op", N_("gives channel operator status to nickname(s)"),
     N_("nickname [nickname]"), "",
     1, 1, 1, irc_cmd_send_op, NULL, NULL },
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 1edfea76c..fb36faac4 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -598,7 +598,14 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
     else
     {
         /* nickname modes */
-        gui_printf (server->buffer, "(TODO!) nickname modes: channel=%s, args=%s\n", arguments, pos);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
+                          "%s", (pos[0] == ':') ? pos + 1 : pos);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", host);
     }
     return 0;
 }
@@ -697,16 +704,18 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
 int
 irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
 {
-    char *pos, *pos2, *pos_usec;
+    char *host2, *pos, *pos2, *pos_usec;
     struct timeval tv;
     struct timezone tz;
     long sec1, usec1, sec2, usec2, difftime;
     
+    host2 = NULL;
     if (host)
     {
         pos = strchr (host, '!');
         if (pos)
             pos[0] = '\0';
+        host2 = pos + 1;
     }
     
     pos = strchr (arguments, ' ');
@@ -778,7 +787,20 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
         }
         else
         {
-            irc_display_prefix (server->buffer, PREFIX_SERVER);
+            if (host)
+            {
+                gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", host);
+                if (host2)
+                {
+                    gui_printf_color (server->buffer,
+                                      COLOR_WIN_CHAT_DARK, " (");
+                    gui_printf_color (server->buffer,
+                                      COLOR_WIN_CHAT_HOST, "%s", host2);
+                    gui_printf_color (server->buffer,
+                                      COLOR_WIN_CHAT_DARK, ")");
+                }
+                gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
+            }
             gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
         }
     }
diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index c096b9224..6d2a6a6d7 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -719,7 +719,29 @@ irc_cmd_send_nick (t_irc_server *server, int argc, char **argv)
 int
 irc_cmd_send_notice (t_irc_server *server, char *arguments)
 {
-    server_sendf (server, "NOTICE %s\r\n", arguments);
+    char *pos;
+    
+    pos = strchr (arguments, ' ');
+    if (pos)
+    {
+        pos[0] = '\0';
+        pos++;
+        while (pos[0] == ' ')
+            pos++;
+        server_sendf (server, "NOTICE %s :%s\r\n", arguments, pos);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "notice");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+    }
+    else
+    {
+        gui_printf (server->buffer,
+                    _("%s wrong argument count for \"%s\" command\n"),
+                    WEECHAT_ERROR, "notice");
+        return -1;
+    }
     return 0;
 }
 
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index f895e01f0..e8d28e1f8 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.0.9-pre1\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-12-21 20:51+0100\n"
+"POT-Creation-Date: 2004-12-22 14:28+0100\n"
 "PO-Revision-Date: 2004-12-21 20:51+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu"
 msgid "can't change mode for other users"
 msgstr "impossible de changer le mode pour les autres utilisateurs"
 
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2912
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2934
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1147,37 +1147,37 @@ msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilisation du nom de machine local \"%s\"\n"
 
 #: src/irc/irc-send.c:256 src/irc/irc-send.c:280 src/irc/irc-send.c:380
-#: src/irc/irc-send.c:691 src/irc/irc-send.c:745 src/irc/irc-send.c:1217
+#: src/irc/irc-send.c:691 src/irc/irc-send.c:767 src/irc/irc-send.c:1239
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 "%s la commande \"%s\" peut seulement être exécutée dans une fenêtre de "
 "canal\n"
 
-#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:792
-#: src/irc/irc-send.c:805 src/irc/irc-send.c:1112
+#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:814
+#: src/irc/irc-send.c:827 src/irc/irc-send.c:1134
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n"
 
 #: src/irc/irc-send.c:569 src/irc/irc-send.c:591 src/irc/irc-recv.c:261
-#: src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1030
 #, c-format
 msgid "%s nick not found for \"%s\" command\n"
 msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:640 src/irc/irc-send.c:881 src/irc/irc-recv.c:1168
+#: src/irc/irc-send.c:640 src/irc/irc-send.c:903 src/irc/irc-recv.c:1190
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
 
-#: src/irc/irc-send.c:670 src/common/command.c:1304
+#: src/irc/irc-send.c:670 src/irc/irc-send.c:741 src/common/command.c:1304
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:1190
+#: src/irc/irc-send.c:1212
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilé le %s %s\n"
@@ -1191,8 +1191,8 @@ msgstr "%s impossible de créer le nouveau canal \"%s\"\n"
 msgid " has joined "
 msgstr " a rejoint "
 
-#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:877
-#: src/irc/irc-recv.c:1017 src/irc/irc-recv.c:2412 src/irc/irc-recv.c:2477
+#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:1039 src/irc/irc-recv.c:2434 src/irc/irc-recv.c:2499
 #, c-format
 msgid "%s channel not found for \"%s\" command\n"
 msgstr "%s canal non trouvé pour la commande \"%s\"\n"
@@ -1293,8 +1293,8 @@ msgstr "donne la voix à"
 msgid "removes voice from"
 msgstr "supprime la voix de"
 
-#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:623 src/irc/irc-recv.c:919
-#: src/irc/irc-recv.c:1262
+#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:630 src/irc/irc-recv.c:941
+#: src/irc/irc-recv.c:1284
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s commande \"%s\" reçue sans host\n"
@@ -1304,251 +1304,255 @@ msgstr "%s commande \"%s\" reçue sans host\n"
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n"
 
-#: src/irc/irc-recv.c:661
+#: src/irc/irc-recv.c:607
+msgid "mode changed by"
+msgstr "mode changé par"
+
+#: src/irc/irc-recv.c:668
 msgid "You are "
 msgstr "Vous êtes "
 
-#: src/irc/irc-recv.c:668
+#: src/irc/irc-recv.c:675
 msgid " is "
 msgstr " est "
 
-#: src/irc/irc-recv.c:672
+#: src/irc/irc-recv.c:679
 msgid "now known as "
 msgstr "maintenant connu sous le nom "
 
-#: src/irc/irc-recv.c:725
+#: src/irc/irc-recv.c:734
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:738 src/irc/irc-recv.c:770
+#: src/irc/irc-recv.c:747 src/irc/irc-recv.c:779
 msgid "reply from"
 msgstr "réponse de"
 
-#: src/irc/irc-recv.c:773
+#: src/irc/irc-recv.c:782
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ": %ld.%ld secondes\n"
 
-#: src/irc/irc-recv.c:803
+#: src/irc/irc-recv.c:825
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s commande \"%s\" reçue sans host ou canal\n"
 
-#: src/irc/irc-recv.c:853
+#: src/irc/irc-recv.c:875
 msgid " has left "
 msgstr " a quitté "
 
-#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1194
+#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1216
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Sur %s: * %s %s"
 
-#: src/irc/irc-recv.c:994
+#: src/irc/irc-recv.c:1016
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Sur %s: %s> %s"
 
-#: src/irc/irc-recv.c:1062
+#: src/irc/irc-recv.c:1084
 msgid "Received a "
 msgstr "Reçu un "
 
-#: src/irc/irc-recv.c:1064
+#: src/irc/irc-recv.c:1086
 msgid "CTCP VERSION "
 msgstr "CTCP VERSION "
 
-#: src/irc/irc-recv.c:1066
+#: src/irc/irc-recv.c:1088
 msgid "from"
 msgstr "de"
 
-#: src/irc/irc-recv.c:1101 src/irc/irc-recv.c:1115 src/irc/irc-recv.c:1130
-#: src/irc/irc-recv.c:1145 src/irc/irc-recv.c:1239 src/irc/irc-recv.c:2698
-#: src/irc/irc-recv.c:2738
+#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1137 src/irc/irc-recv.c:1152
+#: src/irc/irc-recv.c:1167 src/irc/irc-recv.c:1261 src/irc/irc-recv.c:2720
+#: src/irc/irc-recv.c:2760
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s impossible d'analyser la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1242
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privé %s> %s"
 
-#: src/irc/irc-recv.c:1294
+#: src/irc/irc-recv.c:1316
 msgid "has quit"
 msgstr "a quitté"
 
-#: src/irc/irc-recv.c:1414
+#: src/irc/irc-recv.c:1436
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s commande \"%s\" reçue sans canal\n"
 
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1464
 msgid " has changed topic for "
 msgstr " a changé le titre pour "
 
-#: src/irc/irc-recv.c:1447
+#: src/irc/irc-recv.c:1469
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr " en: \"%s\"\n"
 
-#: src/irc/irc-recv.c:1453
+#: src/irc/irc-recv.c:1475
 msgid " has unset topic for "
 msgstr " a retiré le titre pour "
 
-#: src/irc/irc-recv.c:1548
+#: src/irc/irc-recv.c:1570
 #, c-format
 msgid " is away: %s\n"
 msgstr " est absent: %s\n"
 
-#: src/irc/irc-recv.c:1622
+#: src/irc/irc-recv.c:1644
 msgid "Users online: "
 msgstr "Utilisateurs en ligne: "
 
-#: src/irc/irc-recv.c:1985
+#: src/irc/irc-recv.c:2007
 msgid "idle: "
 msgstr "inactivité: "
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "day"
 msgstr "jour"
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hours"
 msgstr "heures"
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hour"
 msgstr "heure"
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minutes"
 msgstr "minutes"
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minute"
 msgstr "minute"
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "seconds"
 msgstr "secondes"
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "second"
 msgstr "seconde"
 
-#: src/irc/irc-recv.c:2020
+#: src/irc/irc-recv.c:2042
 msgid "signon at: "
 msgstr "signé le: "
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2130
 msgid "Channels: "
 msgstr "Canaux: "
 
-#: src/irc/irc-recv.c:2359
+#: src/irc/irc-recv.c:2381
 msgid "No topic set for "
 msgstr "Pas de titre défini pour "
 
-#: src/irc/irc-recv.c:2401
+#: src/irc/irc-recv.c:2423
 msgid "Topic for "
 msgstr "Le titre pour "
 
-#: src/irc/irc-recv.c:2405
+#: src/irc/irc-recv.c:2427
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr " est: \"%s\"\n"
 
-#: src/irc/irc-recv.c:2421 src/irc/irc-recv.c:2501
+#: src/irc/irc-recv.c:2443 src/irc/irc-recv.c:2523
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2467
+#: src/irc/irc-recv.c:2489
 msgid "Topic set by "
 msgstr "Titre défini par "
 
-#: src/irc/irc-recv.c:2485
+#: src/irc/irc-recv.c:2507
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2493
+#: src/irc/irc-recv.c:2515
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2622
+#: src/irc/irc-recv.c:2644
 msgid " on "
 msgstr " sur "
 
-#: src/irc/irc-recv.c:2729
+#: src/irc/irc-recv.c:2751
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:2782
+#: src/irc/irc-recv.c:2804
 msgid "Nicks "
 msgstr "Utilisateurs "
 
-#: src/irc/irc-recv.c:2802
+#: src/irc/irc-recv.c:2824
 msgid "Channel "
 msgstr "Canal "
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nicks"
 msgstr "utilisateurs"
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nick"
 msgstr "utilisateur"
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfops"
 msgstr "halfops"
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfop"
 msgstr "halfop"
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:2848
+#: src/irc/irc-recv.c:2870
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:2881
+#: src/irc/irc-recv.c:2903
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd "
 "nom d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:2892
+#: src/irc/irc-recv.c:2914
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom "
 "d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:2901
+#: src/irc/irc-recv.c:2923
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index b991cd36e..e2e916e80 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-12-21 20:51+0100\n"
+"POT-Creation-Date: 2004-12-22 14:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 msgid "can't change mode for other users"
 msgstr ""
 
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2912
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2934
 msgid "unknown"
 msgstr ""
 
@@ -1056,34 +1056,34 @@ msgid "%s: using local hostname \"%s\"\n"
 msgstr ""
 
 #: src/irc/irc-send.c:256 src/irc/irc-send.c:280 src/irc/irc-send.c:380
-#: src/irc/irc-send.c:691 src/irc/irc-send.c:745 src/irc/irc-send.c:1217
+#: src/irc/irc-send.c:691 src/irc/irc-send.c:767 src/irc/irc-send.c:1239
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 
-#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:792
-#: src/irc/irc-send.c:805 src/irc/irc-send.c:1112
+#: src/irc/irc-send.c:487 src/irc/irc-send.c:553 src/irc/irc-send.c:814
+#: src/irc/irc-send.c:827 src/irc/irc-send.c:1134
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 
 #: src/irc/irc-send.c:569 src/irc/irc-send.c:591 src/irc/irc-recv.c:261
-#: src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1030
 #, c-format
 msgid "%s nick not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:640 src/irc/irc-send.c:881 src/irc/irc-recv.c:1168
+#: src/irc/irc-send.c:640 src/irc/irc-send.c:903 src/irc/irc-recv.c:1190
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:670 src/common/command.c:1304
+#: src/irc/irc-send.c:670 src/irc/irc-send.c:741 src/common/command.c:1304
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1190
+#: src/irc/irc-send.c:1212
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr ""
@@ -1097,8 +1097,8 @@ msgstr ""
 msgid " has joined "
 msgstr ""
 
-#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:877
-#: src/irc/irc-recv.c:1017 src/irc/irc-recv.c:2412 src/irc/irc-recv.c:2477
+#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:593 src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:1039 src/irc/irc-recv.c:2434 src/irc/irc-recv.c:2499
 #, c-format
 msgid "%s channel not found for \"%s\" command\n"
 msgstr ""
@@ -1199,8 +1199,8 @@ msgstr ""
 msgid "removes voice from"
 msgstr ""
 
-#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:623 src/irc/irc-recv.c:919
-#: src/irc/irc-recv.c:1262
+#: src/irc/irc-recv.c:550 src/irc/irc-recv.c:630 src/irc/irc-recv.c:941
+#: src/irc/irc-recv.c:1284
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr ""
@@ -1210,246 +1210,250 @@ msgstr ""
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:661
-msgid "You are "
+#: src/irc/irc-recv.c:607
+msgid "mode changed by"
 msgstr ""
 
 #: src/irc/irc-recv.c:668
+msgid "You are "
+msgstr ""
+
+#: src/irc/irc-recv.c:675
 msgid " is "
 msgstr ""
 
-#: src/irc/irc-recv.c:672
+#: src/irc/irc-recv.c:679
 msgid "now known as "
 msgstr ""
 
-#: src/irc/irc-recv.c:725
+#: src/irc/irc-recv.c:734
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:738 src/irc/irc-recv.c:770
+#: src/irc/irc-recv.c:747 src/irc/irc-recv.c:779
 msgid "reply from"
 msgstr ""
 
-#: src/irc/irc-recv.c:773
+#: src/irc/irc-recv.c:782
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:803
+#: src/irc/irc-recv.c:825
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:853
+#: src/irc/irc-recv.c:875
 msgid " has left "
 msgstr ""
 
-#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1194
+#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1216
 #, c-format
 msgid "On %s: * %s %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:994
+#: src/irc/irc-recv.c:1016
 #, c-format
 msgid "On %s: %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1062
+#: src/irc/irc-recv.c:1084
 msgid "Received a "
 msgstr ""
 
-#: src/irc/irc-recv.c:1064
+#: src/irc/irc-recv.c:1086
 msgid "CTCP VERSION "
 msgstr ""
 
-#: src/irc/irc-recv.c:1066
+#: src/irc/irc-recv.c:1088
 msgid "from"
 msgstr ""
 
-#: src/irc/irc-recv.c:1101 src/irc/irc-recv.c:1115 src/irc/irc-recv.c:1130
-#: src/irc/irc-recv.c:1145 src/irc/irc-recv.c:1239 src/irc/irc-recv.c:2698
-#: src/irc/irc-recv.c:2738
+#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1137 src/irc/irc-recv.c:1152
+#: src/irc/irc-recv.c:1167 src/irc/irc-recv.c:1261 src/irc/irc-recv.c:2720
+#: src/irc/irc-recv.c:2760
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1242
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1294
+#: src/irc/irc-recv.c:1316
 msgid "has quit"
 msgstr ""
 
-#: src/irc/irc-recv.c:1414
+#: src/irc/irc-recv.c:1436
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1464
 msgid " has changed topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:1447
+#: src/irc/irc-recv.c:1469
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1453
+#: src/irc/irc-recv.c:1475
 msgid " has unset topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:1548
+#: src/irc/irc-recv.c:1570
 #, c-format
 msgid " is away: %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1622
+#: src/irc/irc-recv.c:1644
 msgid "Users online: "
 msgstr ""
 
-#: src/irc/irc-recv.c:1985
+#: src/irc/irc-recv.c:2007
 msgid "idle: "
 msgstr ""
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:1993
+#: src/irc/irc-recv.c:2015
 msgid "day"
 msgstr ""
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hours"
 msgstr ""
 
-#: src/irc/irc-recv.c:2003
+#: src/irc/irc-recv.c:2025
 msgid "hour"
 msgstr ""
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minutes"
 msgstr ""
 
-#: src/irc/irc-recv.c:2009
+#: src/irc/irc-recv.c:2031
 msgid "minute"
 msgstr ""
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "seconds"
 msgstr ""
 
-#: src/irc/irc-recv.c:2015
+#: src/irc/irc-recv.c:2037
 msgid "second"
 msgstr ""
 
-#: src/irc/irc-recv.c:2020
+#: src/irc/irc-recv.c:2042
 msgid "signon at: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2130
 msgid "Channels: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2359
+#: src/irc/irc-recv.c:2381
 msgid "No topic set for "
 msgstr ""
 
-#: src/irc/irc-recv.c:2401
+#: src/irc/irc-recv.c:2423
 msgid "Topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:2405
+#: src/irc/irc-recv.c:2427
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2421 src/irc/irc-recv.c:2501
+#: src/irc/irc-recv.c:2443 src/irc/irc-recv.c:2523
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2467
+#: src/irc/irc-recv.c:2489
 msgid "Topic set by "
 msgstr ""
 
-#: src/irc/irc-recv.c:2485
+#: src/irc/irc-recv.c:2507
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2493
+#: src/irc/irc-recv.c:2515
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2622
+#: src/irc/irc-recv.c:2644
 msgid " on "
 msgstr ""
 
-#: src/irc/irc-recv.c:2729
+#: src/irc/irc-recv.c:2751
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2782
+#: src/irc/irc-recv.c:2804
 msgid "Nicks "
 msgstr ""
 
-#: src/irc/irc-recv.c:2802
+#: src/irc/irc-recv.c:2824
 msgid "Channel "
 msgstr ""
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nicks"
 msgstr ""
 
-#: src/irc/irc-recv.c:2813
+#: src/irc/irc-recv.c:2835
 msgid "nick"
 msgstr ""
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "ops"
 msgstr ""
 
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2843
 msgid "op"
 msgstr ""
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfops"
 msgstr ""
 
-#: src/irc/irc-recv.c:2830
+#: src/irc/irc-recv.c:2852
 msgid "halfop"
 msgstr ""
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voices"
 msgstr ""
 
-#: src/irc/irc-recv.c:2839
+#: src/irc/irc-recv.c:2861
 msgid "voice"
 msgstr ""
 
-#: src/irc/irc-recv.c:2848
+#: src/irc/irc-recv.c:2870
 msgid "normal"
 msgstr ""
 
-#: src/irc/irc-recv.c:2881
+#: src/irc/irc-recv.c:2903
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2892
+#: src/irc/irc-recv.c:2914
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2901
+#: src/irc/irc-recv.c:2923
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index 6fbd005b8..0137257d7 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -142,7 +142,7 @@ t_irc_command irc_commands[] =
     1, 1, 1, irc_cmd_send_nick, NULL, irc_cmd_recv_nick },
   { "notice", N_("send notice message to user"),
     N_("nickname text"), N_("nickname: user to send notice to\ntext: text to send"),
-    1, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
+    2, MAX_ARGS, 1, NULL, irc_cmd_send_notice, irc_cmd_recv_notice },
   { "op", N_("gives channel operator status to nickname(s)"),
     N_("nickname [nickname]"), "",
     1, 1, 1, irc_cmd_send_op, NULL, NULL },
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 1edfea76c..fb36faac4 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -598,7 +598,14 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
     else
     {
         /* nickname modes */
-        gui_printf (server->buffer, "(TODO!) nickname modes: channel=%s, args=%s\n", arguments, pos);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
+                          "%s", (pos[0] == ':') ? pos + 1 : pos);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", host);
     }
     return 0;
 }
@@ -697,16 +704,18 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
 int
 irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
 {
-    char *pos, *pos2, *pos_usec;
+    char *host2, *pos, *pos2, *pos_usec;
     struct timeval tv;
     struct timezone tz;
     long sec1, usec1, sec2, usec2, difftime;
     
+    host2 = NULL;
     if (host)
     {
         pos = strchr (host, '!');
         if (pos)
             pos[0] = '\0';
+        host2 = pos + 1;
     }
     
     pos = strchr (arguments, ' ');
@@ -778,7 +787,20 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
         }
         else
         {
-            irc_display_prefix (server->buffer, PREFIX_SERVER);
+            if (host)
+            {
+                gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", host);
+                if (host2)
+                {
+                    gui_printf_color (server->buffer,
+                                      COLOR_WIN_CHAT_DARK, " (");
+                    gui_printf_color (server->buffer,
+                                      COLOR_WIN_CHAT_HOST, "%s", host2);
+                    gui_printf_color (server->buffer,
+                                      COLOR_WIN_CHAT_DARK, ")");
+                }
+                gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
+            }
             gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
         }
     }
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index c096b9224..6d2a6a6d7 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -719,7 +719,29 @@ irc_cmd_send_nick (t_irc_server *server, int argc, char **argv)
 int
 irc_cmd_send_notice (t_irc_server *server, char *arguments)
 {
-    server_sendf (server, "NOTICE %s\r\n", arguments);
+    char *pos;
+    
+    pos = strchr (arguments, ' ');
+    if (pos)
+    {
+        pos[0] = '\0';
+        pos++;
+        while (pos[0] == ' ')
+            pos++;
+        server_sendf (server, "NOTICE %s :%s\r\n", arguments, pos);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "notice");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
+        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+    }
+    else
+    {
+        gui_printf (server->buffer,
+                    _("%s wrong argument count for \"%s\" command\n"),
+                    WEECHAT_ERROR, "notice");
+        return -1;
+    }
     return 0;
 }