diff options
author | Sébastien Helleu <flashcode@flashtux.org> | 2016-08-30 18:36:07 +0200 |
---|---|---|
committer | Sébastien Helleu <flashcode@flashtux.org> | 2016-08-30 18:36:07 +0200 |
commit | 5d5335b2c1ab03f09f021d718c786c080741622b (patch) | |
tree | fb3cdaa58e5f1691a338fdf9464cdbfccaee1001 | |
parent | 9e5ad6aa3ec2d2781ffb2a983bd94ef1ec78ea0d (diff) | |
download | weechat-5d5335b2c1ab03f09f021d718c786c080741622b.zip |
irc: fix display of service notice mask (message 008) (closes #429)
-rw-r--r-- | ChangeLog.adoc | 1 | ||||
-rw-r--r-- | po/cs.po | 4 | ||||
-rw-r--r-- | po/de.po | 6 | ||||
-rw-r--r-- | po/es.po | 4 | ||||
-rw-r--r-- | po/fr.po | 8 | ||||
-rw-r--r-- | po/hu.po | 4 | ||||
-rw-r--r-- | po/it.po | 4 | ||||
-rw-r--r-- | po/ja.po | 6 | ||||
-rw-r--r-- | po/pl.po | 6 | ||||
-rw-r--r-- | po/pt.po | 6 | ||||
-rw-r--r-- | po/pt_BR.po | 4 | ||||
-rw-r--r-- | po/ru.po | 4 | ||||
-rw-r--r-- | po/tr.po | 4 | ||||
-rw-r--r-- | po/weechat.pot | 4 | ||||
-rw-r--r-- | src/plugins/irc/irc-protocol.c | 7 |
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) @@ -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 @@ -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 @@ -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 @@ -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]" @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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; } |