irc: fix display of service notice mask (message 008) (closes #429)

15 files changed, 35 insertions, 37 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index a9a02f4b7..90c35a044 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -39,6 +39,7 @@ Bug fixes::
   * api: fix crash in function network_connect_to() if address is NULL
   * api: fix connection to servers with hook_connect() on Windows 10 with Windows subsystem for Linux (issue #770)
   * api: fix crash in function string_split_command() when the separator is not a semicolon (issue #731)
+  * irc: fix display of service notice mask (message 008) (issue #429)
   * irc: fix NULL pointer dereference in 734 command callback (issue #738)
   * relay: return an empty hdata when the requested hdata or pointer is not found (issue #767)
   * xfer: fix crash on DCC send if option xfer.file.auto_accept_nicks is set (issue #781)
diff --git a/po/cs.po b/po/cs.po
index e7d5332fb..e2650e437 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:42+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8030,7 +8030,7 @@ msgid "%sWallops from %s: %s"
 msgstr "%sWallops od %s: %s"
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "  %s[%s%d%s]%s maska: %s / server: %s / kanál: %s"
 
 #, c-format
diff --git a/po/de.po b/po/de.po
index 536055d82..00ebbd842 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-08-17 08:41+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
@@ -9327,8 +9327,8 @@ msgstr "%s%s%s%s hat das Thema von %s%s%s entfernt"
 msgid "%sWallops from %s: %s"
 msgstr "%sWallops von %s: %s"
 
-#, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+#, fuzzy, c-format
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%sServer notice Maske für %s%s%s is %s[%s%s%s]"
 
 #, c-format
diff --git a/po/es.po b/po/es.po
index 461645945..cbf229d19 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:42+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8333,7 +8333,7 @@ msgid "%sWallops from %s: %s"
 msgstr "%sWallops de %s: %s"
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%sEl modo de usuario para %s%s%s es %s[%s%s%s]"
 
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 9be39a128..bb5be4dca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
-"PO-Revision-Date: 2016-08-27 12:07+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
+"PO-Revision-Date: 2016-08-30 18:34+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -9108,8 +9108,8 @@ msgid "%sWallops from %s: %s"
 msgstr "%sWallops de %s : %s"
 
 #, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
-msgstr "%sLe masque de notice serveur pour %s%s%s est %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
+msgstr "%sMasque de notice serveur pour %s%s%s : %s"
 
 #, c-format
 msgid "%sUser mode for %s%s%s is %s[%s%s%s]"
diff --git a/po/hu.po b/po/hu.po
index a58c5891e..6d112e0cd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7448,7 +7448,7 @@ msgid "%sWallops from %s: %s"
 msgstr "%s%s %s(%s%s@%s%s)%s neve %s volt\n"
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%s%s%s felhasználói módja: %s[%s%s%s]\n"
 
 #, fuzzy, c-format
diff --git a/po/it.po b/po/it.po
index 52a4a3e01..9251f1d91 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8502,7 +8502,7 @@ msgid "%sWallops from %s: %s"
 msgstr "%sWallop da %s: %s"
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%sModalità utente per %s%s%s è %s[%s%s%s]"
 
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index ac3ef7730..cb5b664c3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-08-21 09:00+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -8735,8 +8735,8 @@ msgstr "%s%s%s%s が %s%s%s のトピックを削除"
 msgid "%sWallops from %s: %s"
 msgstr "%s%s からの wallops メッセージ: %s"
 
-#, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+#, fuzzy, c-format
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%s%s%s%s のサーバ通知マスクは %s[%s%s%s] です"
 
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 26944500a..bef870532 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys1@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8919,8 +8919,8 @@ msgstr "%s%s%s%s usunął temat %s%s%s"
 msgid "%sWallops from %s: %s"
 msgstr "%sWallopy od %s: %s"
 
-#, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+#, fuzzy, c-format
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%sMaska powiadomień serwera dla %s%s%s to %s[%s%s%s]"
 
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 4be6ea2ec..53a51326d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -8920,8 +8920,8 @@ msgstr "%s%s%s%s retirou o tópico de %s%s%s"
 msgid "%sWallops from %s: %s"
 msgstr "%sWallops de %s: %s"
 
-#, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+#, fuzzy, c-format
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%sA máscara de notice do servidor  %s%s%s é %s[%s%s%s]"
 
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b4c981b8c..c43430941 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7864,7 +7864,7 @@ msgid "%sWallops from %s: %s"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%sTópico para o canal %s%s%s é \"%s%s\""
 
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 4b68575ac..b0f6505a7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7485,7 +7485,7 @@ msgid "%sWallops from %s: %s"
 msgstr "%s%s %s(%s%s@%s%s)%s был %s\n"
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "Режим пользователя %s%s%s - %s[%s%s%s]\n"
 
 #, fuzzy, c-format
diff --git a/po/tr.po b/po/tr.po
index fb889d989..5834de98b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6727,7 +6727,7 @@ msgid "%sWallops from %s: %s"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr "%s %s%s%s kanalının konusu \"%s%s\""
 
 #, c-format
diff --git a/po/weechat.pot b/po/weechat.pot
index d0234103d..6f82b893a 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-27 11:58+0200\n"
+"POT-Creation-Date: 2016-08-30 18:33+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6645,7 +6645,7 @@ msgid "%sWallops from %s: %s"
 msgstr ""
 
 #, c-format
-msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
+msgid "%sServer notice mask for %s%s%s: %s"
 msgstr ""
 
 #, c-format
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 26f497d5d..b85093758 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -2688,15 +2688,12 @@ IRC_PROTOCOL_CALLBACK(008)
         irc_msgbuffer_get_target_buffer (server, argv[2], command, NULL, NULL),
         date,
         irc_protocol_tags (command, "irc_numeric", NULL, address),
-        _("%sServer notice mask for %s%s%s is %s[%s%s%s]"),
+        _("%sServer notice mask for %s%s%s: %s"),
         weechat_prefix ("network"),
         irc_nick_color_for_msg (server, 1, NULL, argv[2]),
         argv[2],
         IRC_COLOR_RESET,
-        IRC_COLOR_CHAT_DELIMITERS,
-        IRC_COLOR_RESET,
-        (argv[3][0] == ':') ? argv[3] + 1 : argv[3],
-        IRC_COLOR_CHAT_DELIMITERS);
+        (argv_eol[3][0] == ':') ? argv_eol[3] + 1 : argv_eol[3]);
 
     return WEECHAT_RC_OK;
 }