foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irc: add "user" in output of irc_message_parse (closes #136)

v2.8-utf8proc
Sébastien Helleu 2019-09-27 20:52:00 +02:00
parent 3f33b327b1
commit ae38b11407
36 changed files with 259 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -22,6 +22,7 @@ New features::
* core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
* core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue #997)
* irc: add "user" in output of irc_message_parse (issue #136)
* irc: add options irc.color.message_kick and irc.color.reason_kick (issue #683, issue #684)
* script: add options "-ol" and "-il" in command /script to send translated string with list of scripts loaded, display "No scripts loaded" if no scripts are loaded

2
doc/de/autogen/plugin_api/infos_hashtable.adoc
View File

@ -6,7 +6,7 @@
|===
| Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)
| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein), "text": Text (zum Beispiel eine Nachricht von einem User), "pos_command": Index der "command" Nachricht ("-1" falls "command" nicht gefunden wird), "pos_arguments": Index der "arguments" Nachricht ("-1" falls "arguments" nicht gefunden wird), "pos_channel": Index der "channel" Nachricht ("-1" falls "channel" nicht gefunden wird),"pos_text": Index für "text" Nachricht ("-1" falls "text" nicht gefunden wird)
| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_split | trennt eine IRC Nachricht (standardmäßig in 512 Bytes große Nachrichten) | "message": IRC Nachricht, "server": Servername (optional) | "msg1" ... "msgN": Nachrichten die versendet werden sollen (ohne abschließendes "\r\n"), "args1" ... "argsN": Argumente für Nachrichten, "count": Anzahl der Nachrichten

6
doc/de/weechat_scripting.de.adoc
View File

@ -1177,6 +1177,11 @@ Das Ergebnis ist eine Hashtabelle mit folgenden Schlüsseln
der ursprüngliche Nick. |
`nick`
// TRANSLATION MISSING
| user | ≥ 2.7 |
The origin user. |
`user`
| host | ≥ 0.3.4 |
der ursprüngliche Host (beinhaltet den Nick). |
`nick!user@host`
@ -1224,6 +1229,7 @@ dict = weechat.info_get_hashtable(
# "tags": "time=2015-06-27T16:40:35.000Z",
# "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
# "nick": "nick",
# "user": "user",
# "host": "nick!user@host",
# "command": "PRIVMSG",
# "channel": "#weechat",

2
doc/en/autogen/plugin_api/infos_hashtable.adoc
View File

@ -6,7 +6,7 @@
|===
| Plugin | Name | Description | Hashtable (input) | Hashtable (output)
| irc | irc_message_parse | parse an IRC message | "message": IRC message, "server": server name (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_parse | parse an IRC message | "message": IRC message, "server": server name (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_split | split an IRC message (to fit in 512 bytes by default) | "message": IRC message, "server": server name (optional) | "msg1" ... "msgN": messages to send (without final "\r\n"), "args1" ... "argsN": arguments of messages, "count": number of messages

1
doc/en/weechat_plugin_api.en.adoc
View File

@ -14845,6 +14845,7 @@ if (hashtable_in)
* "tags" : "time=2015-06-27T16:40:35.000Z"
* "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!"
* "nick" : "nick"
* "user" : "user"
* "host" : "nick!user@host"
* "command" : "PRIVMSG"
* "channel" : "#weechat"

5
doc/en/weechat_scripting.en.adoc
View File

@ -1153,6 +1153,10 @@ The result is a hashtable with following keys
The origin nick. |
`nick`
| user | ≥ 2.7 |
The origin user. |
`user`
| host | ≥ 0.3.4 |
The origin host (includes the nick). |
`nick!user@host`
@ -1200,6 +1204,7 @@ dict = weechat.info_get_hashtable(
# "tags": "time=2015-06-27T16:40:35.000Z",
# "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
# "nick": "nick",
# "user": "user",
# "host": "nick!user@host",
# "command": "PRIVMSG",
# "channel": "#weechat",

2
doc/fr/autogen/plugin_api/infos_hashtable.adoc
View File

@ -6,7 +6,7 @@
|===
| Extension | Nom | Description | Table de hachage (entrée) | Table de hachage (sortie)
| irc | irc_message_parse | analyse un message IRC | "message" : message IRC, "server" : nom du serveur (optionnel) | "tags" : étiquettes, "message_without_tags" : message sans les étiquettes, "nick" : pseudo, "host" : nom d'hôte, "command" : commande, "channel" : canal, "arguments" : paramètres (inclut le canal), "text" : texte (par exemple message utilisateur), "pos_command" : index de "command" dans le message ("-1" si "command" n'a pas été trouvé), "pos_arguments" : index de "arguments" dans le message ("-1" si "arguments" n'a pas été trouvé), "pos_channel" : index de "channel" dans le message ("-1" si "channel" n'a pas été trouvé), "pos_text" : index de "text" dans le message ("-1" si "text" n'a pas été trouvé)
| irc | irc_message_parse | analyse un message IRC | "message" : message IRC, "server" : nom du serveur (optionnel) | "tags" : étiquettes, "message_without_tags" : message sans les étiquettes, "nick" : pseudo, "user" : nom d'utilisateur, "host" : nom d'hôte, "command" : commande, "channel" : canal, "arguments" : paramètres (inclut le canal), "text" : texte (par exemple message utilisateur), "pos_command" : index de "command" dans le message ("-1" si "command" n'a pas été trouvé), "pos_arguments" : index de "arguments" dans le message ("-1" si "arguments" n'a pas été trouvé), "pos_channel" : index de "channel" dans le message ("-1" si "channel" n'a pas été trouvé), "pos_text" : index de "text" dans le message ("-1" si "text" n'a pas été trouvé)
| irc | irc_message_split | découper un message IRC (pour tenir dans les 512 octets par défaut) | "message" : message IRC, "server" : nom du serveur (optionnel) | "msg1" ... "msgN" : messages à envoyer (sans le "\r\n" final), "args1" ... "argsN" : paramètres des messages, "count" : nombre de messages

1
doc/fr/weechat_plugin_api.fr.adoc
View File

@ -15165,6 +15165,7 @@ if (hashtable_in)
* "tags" : "time=2015-06-27T16:40:35.000Z"
* "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!"
* "nick" : "nick"
" "user" : "user"
* "host" : "nick!user@host"
* "command" : "PRIVMSG"
* "channel" : "#weechat"

5
doc/fr/weechat_scripting.fr.adoc
View File

@ -1185,6 +1185,10 @@ Le résultat est une table de hachage avec les clés suivantes
Le pseudo d'origine. |
`nick`
| user | ≥ 2.7 |
L'utilisateur d'origine. |
`user`
| host | ≥ 0.3.4 |
L'hôte d'origine (incluant le pseudo). |
`nick!user@host`
@ -1232,6 +1236,7 @@ dict = weechat.info_get_hashtable(
# "tags": "time=2015-06-27T16:40:35.000Z",
# "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
# "nick": "nick",
# "user": "user",
# "host": "nick!user@host",
# "command": "PRIVMSG",
# "channel": "#weechat",

2
doc/it/autogen/plugin_api/infos_hashtable.adoc
View File

@ -6,7 +6,7 @@
|===
| Plugin | Nome | Descrizione | Tabella hash (input) | Tabella hash (output)
| irc | irc_message_parse | controlla un messaggio IRC | "message": messaggio IRC, "server": nome server (opzionale) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_parse | controlla un messaggio IRC | "message": messaggio IRC, "server": nome server (opzionale) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_split | split an IRC message (to fit in 512 bytes by default) | "message": messaggio IRC, "server": nome server (opzionale) | "msg1" ... "msgN": messaggio da inviare (senza "\r\n" finale), "args1" ... "argsN": argomenti dei messaggi, "count": numero di messaggi

1
doc/it/weechat_plugin_api.it.adoc
View File

@ -15448,6 +15448,7 @@ if (hashtable_in)
* "tags" : "time=2015-06-27T16:40:35.000Z"
* "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!"
* "nick" : "nick"
* "user" : "user"
* "host" : "nick!user@host"
* "command" : "PRIVMSG"
* "channel" : "#weechat"

6
doc/it/weechat_scripting.it.adoc
View File

@ -1190,6 +1190,11 @@ The result is a hashtable with following keys
The origin nick. |
`nick`
// TRANSLATION MISSING
| user | ≥ 2.7 |
The origin user. |
`user`
| host | ≥ 0.3.4 |
The origin host (includes the nick). |
`nick!user@host`
@ -1237,6 +1242,7 @@ dict = weechat.info_get_hashtable(
# "tags": "time=2015-06-27T16:40:35.000Z",
# "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
# "nick": "nick",
# "user": "user",
# "host": "nick!user@host",
# "command": "PRIVMSG",
# "channel": "#weechat",

2
doc/ja/autogen/plugin_api/infos_hashtable.adoc
View File

@ -6,7 +6,7 @@
|===
| プラグイン | 名前 | 説明 | ハッシュテーブル (入力) | ハッシュテーブル (出力)
| irc | irc_message_parse | IRC メッセージを解析 | "message": IRC メッセージ、"server": サーバ名 (任意) | "tags": タグ、"message_without_tags": タグを含まないメッセージ、"nick": ニックネーム、"host": ホスト名、"command": コマンド、"channel": チャンネル、"arguments": 引数 (チャンネルを含む)、"text": テキスト (例えばユーザメッセージ)、"pos_command": "command" メッセージのインデックス ("command" が見つからない場合 "-1")、"pos_arguments": "arguments" メッセージのインデックス ("arguments" が見つからない場合 "-1")、"pos_channel": "channel" メッセージのインデックス ("channel" が見つからない場合 "-1")、"pos_text": "text" メッセージのインデックス ("text" が見つからない場合 "-1")
| irc | irc_message_parse | IRC メッセージを解析 | "message": IRC メッセージ、"server": サーバ名 (任意) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_split | IRC メッセージを分割 (デフォルトでは 512 バイト内に収まるように分割します) | "message": IRC メッセージ、"server": サーバ名 (任意) | "msg1" ... "msgN": 送信メッセージ (最後の "\r\n" は無し), "args1" ... "argsN": メッセージの引数、"count": メッセージの数

1
doc/ja/weechat_plugin_api.ja.adoc
View File

@ -14815,6 +14815,7 @@ if (hashtable_in)
* "tags" : "time=2015-06-27T16:40:35.000Z"
* "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!"
* "nick" : "nick"
* "user" : "user"
* "host" : "nick!user@host"
* "command" : "PRIVMSG"
* "channel" : "#weechat"

6
doc/ja/weechat_scripting.ja.adoc
View File

@ -1161,6 +1161,11 @@ _WeeChat バージョン 0.3.4 以上で利用可。_
発信者のニックネーム |
`nick`
// TRANSLATION MISSING
| user | ≥ 2.7 |
The origin user. |
`user`
| host | 0.3.4 以上 |
発信者のホスト (ニックネームを含む) |
`nick!user@host`
@ -1208,6 +1213,7 @@ dict = weechat.info_get_hashtable(
# "tags": "time=2015-06-27T16:40:35.000Z",
# "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
# "nick": "nick",
# "user": "user",
# "host": "nick!user@host",
# "command": "PRIVMSG",
# "channel": "#weechat",

2
doc/pl/autogen/plugin_api/infos_hashtable.adoc
View File

@ -6,7 +6,7 @@
|===
| Wtyczka | Nazwa | Opis | Hashtable (wejście) | Hashtable (wyjście)
| irc | irc_message_parse | przetwarza wiadomość IRC | "message": wiadomość IRC, "server": nazwa serwera (opcjonalne) | "tags": tagi, "message_without_tags": wiadomość bez tagów, "nick": nick, "host": host, "command": komenda, "channel": kanał, "arguments": argumenty (razem z kanałem), "text": tekst (na przykład wiadomość użytkownika), "pos_command": indeks wiadomości "command" message ("-1" jeśli "command" nie zostało znalezione), "pos_arguments": indeks wiadomości "arguments" ("-1" jeśli "arguments" nie zostało znalezione), "pos_channel": indeks wiadomości "channel" ("-1" jeśli "channel" nie został znaleziony), "pos_text": indeks słowa "text" ("-1" jeśli "text" nie został znaleziony)
| irc | irc_message_parse | przetwarza wiadomość IRC | "message": wiadomość IRC, "server": nazwa serwera (opcjonalne) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
| irc | irc_message_split | dziel wiadomość IRC (aby zmieściła się domyślnie w 512 bajtach) | "message": wiadomość IRC, "server": nazwa serwera (opcjonalne) | "msg1" ... "msgN": wiadomości do wysłania (bez kończącego "\r\n"), "args1" ... "argsN": argumenty wiadomości, "count": ilość wiadomości

6
doc/pl/weechat_scripting.pl.adoc
View File

@ -1160,6 +1160,11 @@ Wynik jest tabela hashy z następującymi kluczami
Nick żródła. |
`nick`
// TRANSLATION MISSING
| user | ≥ 2.7 |
The origin user. |
`user`
| host | ≥ 0.3.4 |
Host żródła (zawiera nick). |
`nick!user@host`
@ -1207,6 +1212,7 @@ dict = weechat.info_get_hashtable(
# "tags": "time=2015-06-27T16:40:35.000Z",
# "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
# "nick": "nick",
# "user": "user",
# "host": "nick!user@host",
# "command": "PRIVMSG",
# "channel": "#weechat",

18
po/cs.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:31+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8780,10 +8780,10 @@ msgstr "\"message\": IRC zpráva, \"server\": jméno serveru (volitelné)"
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -9702,6 +9702,10 @@ msgstr "%s%s: nemůžu načíst soubor \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: nemůžu spustit soubor \"%s\""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== konec backlogu (%d řádků) =========="
#, fuzzy
msgid "Log buffers to files"
msgstr "konfigurační soubory"
@ -9742,10 +9746,6 @@ msgstr "%s\t**** Začátek logu ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Konec logu ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== konec backlogu (%d řádků) =========="
msgid "Logging on buffers:"
msgstr "Loguji buffery:"

19
po/de.po
View File

@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-09-24 21:42+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@ -10565,12 +10565,13 @@ msgid "\"message\": IRC message, \"server\": server name (optional)"
msgstr "\"message\": IRC Nachricht, \"server\": Servername (optional)"
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -11517,6 +11518,10 @@ msgstr "%s%s: Kann die Datei \"%s\" nicht laden"
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: Die Datei \"%s\" kann nicht ausgeführt werden"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Ende des Verlaufspeichers (%d Zeilen) =========="
msgid "Log buffers to files"
msgstr "sichert Buffer in eine Datei"
@ -11558,10 +11563,6 @@ msgstr "%s\t**** Beginn der Protokoll-Datei ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Ende der Protokoll-Datei ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Ende des Verlaufspeichers (%d Zeilen) =========="
msgid "Logging on buffers:"
msgstr "Protokollieren der Buffer:"

18
po/es.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:31+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -9085,10 +9085,10 @@ msgstr "\"message\": mensaje IRC, \"server\": nombre del servidor (opcional)"
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -10015,6 +10015,10 @@ msgstr "%s%s: no es posible cargar el archivo \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: no es posible ejecutar el archivo \"%s\""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Fin del último registro (%d líneas) =========="
msgid "Log buffers to files"
msgstr "Guardar registro de buffers"
@ -10054,10 +10058,6 @@ msgstr "%s\t**** Comienzo del registro ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Fin del registro ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Fin del último registro (%d líneas) =========="
msgid "Logging on buffers:"
msgstr "Guardando registro en los buffers:"

37
po/fr.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"PO-Revision-Date: 2019-09-24 21:03+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-09-27 18:20+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@ -10317,23 +10317,24 @@ msgstr "\"message\" : message IRC, \"server\" : nom du serveur (optionnel)"
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
msgstr ""
"\"tags\" : étiquettes, \"message_without_tags\" : message sans les "
"étiquettes, \"nick\" : pseudo, \"host\" : nom d'hôte, \"command\" : "
"commande, \"channel\" : canal, \"arguments\" : paramètres (inclut le canal), "
"\"text\" : texte (par exemple message utilisateur), \"pos_command\" : index "
"de \"command\" dans le message (\"-1\" si \"command\" n'a pas été trouvé), "
"\"pos_arguments\" : index de \"arguments\" dans le message (\"-1\" si "
"\"arguments\" n'a pas été trouvé), \"pos_channel\" : index de \"channel\" "
"dans le message (\"-1\" si \"channel\" n'a pas été trouvé), \"pos_text\" : "
"index de \"text\" dans le message (\"-1\" si \"text\" n'a pas été trouvé)"
"étiquettes, \"nick\" : pseudo, \"user\" : nom d'utilisateur, \"host\" : nom "
"d'hôte, \"command\" : commande, \"channel\" : canal, \"arguments\" : "
"paramètres (inclut le canal), \"text\" : texte (par exemple message "
"utilisateur), \"pos_command\" : index de \"command\" dans le message (\"-1\" "
"si \"command\" n'a pas été trouvé), \"pos_arguments\" : index de \"arguments"
"\" dans le message (\"-1\" si \"arguments\" n'a pas été trouvé), "
"\"pos_channel\" : index de \"channel\" dans le message (\"-1\" si \"channel"
"\" n'a pas été trouvé), \"pos_text\" : index de \"text\" dans le message "
"(\"-1\" si \"text\" n'a pas été trouvé)"
msgid "split an IRC message (to fit in 512 bytes by default)"
msgstr "découper un message IRC (pour tenir dans les 512 octets par défaut)"
@ -11247,6 +11248,10 @@ msgstr "%s%s : impossible de charger le fichier \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s : impossible d'exécuter le fichier \"%s\""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Fin de l'historique (%d lignes) =========="
msgid "Log buffers to files"
msgstr "Enregistrement des tampons dans des fichiers"
@ -11287,10 +11292,6 @@ msgstr "%s\t**** Début du log ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Fin du log ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Fin de l'historique (%d lignes) =========="
msgid "Logging on buffers:"
msgstr "Enregistrement des tampons :"

18
po/hu.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:31+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8179,10 +8179,10 @@ msgstr ""
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -9089,6 +9089,10 @@ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
msgid "%s%s: unable to execute file \"%s\""
msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
#, fuzzy
msgid "Log buffers to files"
msgstr "szerver konfigurációs fájljának újraolvastatása"
@ -9125,10 +9129,6 @@ msgstr "**** Naplófájl kezdete "
msgid "%s\t**** End of log ****"
msgstr "**** Naplófájl vége "
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
#, fuzzy
msgid "Logging on buffers:"
msgstr "Aliaszok listája:\n"

18
po/it.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:31+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -9275,10 +9275,10 @@ msgstr "\"message\": messaggio IRC, \"server\": nome server (opzionale)"
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -10197,6 +10197,10 @@ msgstr "%s%s: impossibile caricare il file \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: impossibile eseguire il file \"%s\""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Fine della cronologia (%d righe) =========="
msgid "Log buffers to files"
msgstr "Registra i buffer su file"
@ -10236,10 +10240,6 @@ msgstr "%s\t**** Inizio del log ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Fine del log ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Fine della cronologia (%d righe) =========="
msgid "Logging on buffers:"
msgstr "Logging sui buffer:"

19
po/ja.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-09-22 18:54+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@ -9896,12 +9896,13 @@ msgid "\"message\": IRC message, \"server\": server name (optional)"
msgstr "\"message\": IRC メッセージ、\"server\": サーバ名 (任意)"
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -10828,6 +10829,10 @@ msgstr "%s%s: ファイル \"%s\" をロードできません"
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: ファイル \"%s\" を実行できません"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== バックログの最後 (%d 行) =========="
msgid "Log buffers to files"
msgstr "ファイルにバッファログを保存"
@ -10867,10 +10872,6 @@ msgstr "%s\t**** ログの最初 ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** ログの最後 ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== バックログの最後 (%d 行) =========="
msgid "Logging on buffers:"
msgstr "バッファのログ保存:"

19
po/pl.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-09-22 18:54+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@ -10071,12 +10071,13 @@ msgid "\"message\": IRC message, \"server\": server name (optional)"
msgstr "\"message\": wiadomość IRC, \"server\": nazwa serwera (opcjonalne)"
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -10994,6 +10995,10 @@ msgstr "%s%s: nie można wczytać pliku \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: nie można wykonać pliku \"%s\""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Koniec backloga (%d linii) =========="
msgid "Log buffers to files"
msgstr "Zapisuj bufory do plików"
@ -11033,10 +11038,6 @@ msgstr "%s\t**** Początek logu ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Koniec logu ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s========== Koniec backloga (%d linii) =========="
msgid "Logging on buffers:"
msgstr "Loguję w buforach:"

19
po/pt.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-09-22 18:54+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@ -9725,12 +9725,13 @@ msgid "\"message\": IRC message, \"server\": server name (optional)"
msgstr "\"message\": mensagem de IRC, \"server\": nome do servidor (opcional)"
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -10663,6 +10664,10 @@ msgstr "%s%s: não foi possível carregar o ficheiro \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: não foi possível executar o ficheiro \"%s\""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s====== Fim do registo recente (%d linhas) ====="
msgid "Log buffers to files"
msgstr "Registar buffers em ficheiros"
@ -10702,10 +10707,6 @@ msgstr "%s\t**** Início do registo ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Fim do registo ****"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "%s===\t%s====== Fim do registo recente (%d linhas) ====="
msgid "Logging on buffers:"
msgstr "A registar os buffers:"

18
po/pt_BR.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:32+0200\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8611,10 +8611,10 @@ msgstr "\"mensagem\": mensagem IRC, \"servidor\": nome do servidor (opcional)"
#, fuzzy
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -9531,6 +9531,10 @@ msgstr "%s%s: não foi possível carregar arquivo \"%s\""
msgid "%s%s: unable to execute file \"%s\""
msgstr "%s%s: não foi possível executar arquivo \"%s\""
#, fuzzy, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "===\t========== Fim do backlog (%d linhas) =========="
#, fuzzy
msgid "Log buffers to files"
msgstr "arquivos de configuração"
@ -9572,10 +9576,6 @@ msgstr "%s\t*** Início do registro ****"
msgid "%s\t**** End of log ****"
msgstr "%s\t**** Final do registro ****"
#, fuzzy, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr "===\t========== Fim do backlog (%d linhas) =========="
msgid "Logging on buffers:"
msgstr "Registrando buffers:"

18
po/ru.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:32+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8215,10 +8215,10 @@ msgstr ""
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -9126,6 +9126,10 @@ msgstr "Не могу записать лог-файл \"%s\"\n"
msgid "%s%s: unable to execute file \"%s\""
msgstr "Не могу записать лог-файл \"%s\"\n"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
#, fuzzy
msgid "Log buffers to files"
msgstr "перезагрузить конфигурационный файл сервера"
@ -9162,10 +9166,6 @@ msgstr "**** Начало log-файла"
msgid "%s\t**** End of log ****"
msgstr "**** Конец log-файла"
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
#, fuzzy
msgid "Logging on buffers:"
msgstr "Список сокращений:\n"

18
po/tr.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+0200\n"
"PO-Revision-Date: 2019-05-13 21:32+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -7425,10 +7425,10 @@ msgstr ""
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -8297,6 +8297,10 @@ msgstr ""
msgid "%s%s: unable to execute file \"%s\""
msgstr ""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
msgid "Log buffers to files"
msgstr ""
@ -8332,10 +8336,6 @@ msgstr ""
msgid "%s\t**** End of log ****"
msgstr ""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
msgid "Logging on buffers:"
msgstr ""

18
po/weechat.pot
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2019-09-24 20:55+0200\n"
"POT-Creation-Date: 2019-09-27 18:18+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"
@ -7286,10 +7286,10 @@ msgstr ""
#. TRANSLATORS: please do not translate key names (enclosed by quotes)
msgid ""
"\"tags\": tags, \"message_without_tags\": message without the tags, \"nick"
"\": nick, \"host\": host, \"command\": command, \"channel\": channel, "
"\"arguments\": arguments (includes channel), \"text\": text (for example "
"user message), \"pos_command\": index of \"command\" message (\"-1\" if "
"\"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"\": nick, \"user\": user, \"host\": host, \"command\": command, \"channel\": "
"channel, \"arguments\": arguments (includes channel), \"text\": text (for "
"example user message), \"pos_command\": index of \"command\" message (\"-1\" "
"if \"command\" was not found), \"pos_arguments\": index of \"arguments\" "
"message (\"-1\" if \"arguments\" was not found), \"pos_channel\": index of "
"\"channel\" message (\"-1\" if \"channel\" was not found), \"pos_text\": "
"index of \"text\" message (\"-1\" if \"text\" was not found)"
@ -8160,6 +8160,10 @@ msgstr ""
msgid "%s%s: unable to execute file \"%s\""
msgstr ""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
msgid "Log buffers to files"
msgstr ""
@ -8195,10 +8199,6 @@ msgstr ""
msgid "%s\t**** End of log ****"
msgstr ""
#, c-format
msgid "%s===\t%s========== End of backlog (%d lines) =========="
msgstr ""
msgid "Logging on buffers:"
msgstr ""

1
src/plugins/irc/irc-info.c
View File

@ -1118,6 +1118,7 @@ irc_info_init ()
N_("\"tags\": tags, "
"\"message_without_tags\": message without the tags, "
"\"nick\": nick, "
"\"user\": user, "
"\"host\": host, "
"\"command\": command, "
"\"channel\": channel, "

18
src/plugins/irc/irc-message.c
View File

@ -53,6 +53,7 @@
* tags: "time=2015-06-27T16:40:35.000Z"
* msg_without_tags: ":nick!user@host PRIVMSG #weechat :hello!"
* nick: "nick"
* user: "user"
* host: "nick!user@host"
* command: "PRIVMSG"
* channel: "#weechat"
@ -67,7 +68,7 @@
void
irc_message_parse (struct t_irc_server *server, const char *message,
char **tags, char **message_without_tags, char **nick,
char **host, char **command, char **channel,
char **user, char **host, char **command, char **channel,
char **arguments, char **text,
int *pos_command, int *pos_arguments, int *pos_channel,
int *pos_text)
@ -80,6 +81,8 @@ irc_message_parse (struct t_irc_server *server, const char *message,
*message_without_tags = NULL;
if (nick)
*nick = NULL;
if (user)
*user = NULL;
if (host)
*host = NULL;
if (command)
@ -146,6 +149,11 @@ irc_message_parse (struct t_irc_server *server, const char *message,
/* if the prefix doesn't contain a '!', split the nick at '@' */
if (!pos2 || (pos && pos2 > pos))
pos2 = pos3;
if (pos2 && pos3 && (pos3 > pos2))
{
if (user)
*user = weechat_strndup (pos2 + 1, pos3 - pos2 - 1);
}
if (pos2 && (!pos || pos > pos2))
{
if (nick)
@ -336,14 +344,14 @@ struct t_hashtable *
irc_message_parse_to_hashtable (struct t_irc_server *server,
const char *message)
{
char *tags, *message_without_tags, *nick, *host, *command, *channel;
char *tags, *message_without_tags, *nick, *user, *host, *command, *channel;
char *arguments, *text, str_pos[32];
char empty_str[1] = { '\0' };
int pos_command, pos_arguments, pos_channel, pos_text;
struct t_hashtable *hashtable;
irc_message_parse (server, message, &tags, &message_without_tags, &nick,
&host, &command, &channel, &arguments, &text,
&user, &host, &command, &channel, &arguments, &text,
&pos_command, &pos_arguments, &pos_channel, &pos_text);
hashtable = weechat_hashtable_new (32,
@ -359,6 +367,8 @@ irc_message_parse_to_hashtable (struct t_irc_server *server,
(message_without_tags) ? message_without_tags : empty_str);
weechat_hashtable_set (hashtable, "nick",
(nick) ? nick : empty_str);
weechat_hashtable_set (hashtable, "user",
(user) ? user : empty_str);
weechat_hashtable_set (hashtable, "host",
(host) ? host : empty_str);
weechat_hashtable_set (hashtable, "command",
@ -384,6 +394,8 @@ irc_message_parse_to_hashtable (struct t_irc_server *server,
free (message_without_tags);
if (nick)
free (nick);
if (user)
free (user);
if (host)
free (host);
if (command)

5
src/plugins/irc/irc-message.h
View File

@ -25,8 +25,9 @@ struct t_irc_channel;
extern void irc_message_parse (struct t_irc_server *server, const char *message,
char **tags, char **message_without_tags,
char **nick, char **host, char **command,
char **channel, char **arguments, char **text,
char **nick, char **user, char **host,
char **command, char **channel,
char **arguments, char **text,
int *pos_command, int *pos_arguments,
int *pos_channel, int *pos_text);
extern struct t_hashtable *irc_message_parse_to_hashtable (struct t_irc_server *server,

9
src/plugins/irc/irc-notify.c
View File

@ -869,8 +869,8 @@ irc_notify_hsignal_cb (const void *pointer, void *data, const char *signal,
for (i = 0; i < num_messages; i++)
{
irc_message_parse (ptr_server, messages[i], NULL, NULL, NULL,
NULL, NULL, NULL, &arguments, NULL, NULL,
NULL, NULL, NULL);
NULL, NULL, NULL, NULL, &arguments, NULL,
NULL, NULL, NULL, NULL);
if (arguments)
{
pos = strchr (arguments, ' ');
@ -967,8 +967,9 @@ irc_notify_hsignal_cb (const void *pointer, void *data, const char *signal,
for (i = 0; i < num_messages; i++)
{
irc_message_parse (ptr_server, messages[i], NULL, NULL,
NULL, NULL, &irc_cmd, NULL, &arguments,
NULL, NULL, NULL, NULL, NULL);
NULL, NULL, NULL, &irc_cmd, NULL,
&arguments, NULL, NULL, NULL, NULL,
NULL);
if (irc_cmd && arguments)
{
if (strcmp (irc_cmd, "401") == 0)

11
src/plugins/irc/irc-server.c
View File

@ -2499,7 +2499,8 @@ irc_server_send_one_msg (struct t_irc_server *server, int flags,
msg_encoded = NULL;
irc_message_parse (server, ptr_msg, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, &pos_channel, &pos_text);
NULL, NULL, NULL, NULL, NULL, &pos_channel,
&pos_text);
switch (IRC_SERVER_OPTION_INTEGER(server,
IRC_SERVER_OPTION_CHARSET_MESSAGE))
{
@ -2710,8 +2711,8 @@ irc_server_sendf (struct t_irc_server *server, int flags, const char *tags,
{
/* run modifier "irc_out1_xxx" (like "irc_out_xxx", but before split) */
irc_message_parse (server, items[i], NULL, NULL,
&nick, NULL, &command, &channel, NULL, NULL, NULL,
NULL, NULL, NULL);
&nick, NULL, NULL, &command, &channel, NULL, NULL,
NULL, NULL, NULL, NULL);
snprintf (str_modifier, sizeof (str_modifier),
"irc_out1_%s",
(command) ? command : "unknown");
@ -2972,7 +2973,7 @@ irc_server_msgq_flush ()
ptr_data);
irc_message_parse (irc_recv_msgq->server,
ptr_data, NULL, NULL, NULL, NULL,
ptr_data, NULL, NULL, NULL, NULL, NULL,
&command, NULL, NULL, NULL, NULL, NULL,
NULL, NULL);
snprintf (str_modifier, sizeof (str_modifier),
@ -3013,7 +3014,7 @@ irc_server_msgq_flush ()
}
irc_message_parse (irc_recv_msgq->server, ptr_msg,
NULL, NULL, &nick, &host,
NULL, NULL, &nick, NULL, &host,
&command, &channel, &arguments,
NULL, NULL, NULL,
&pos_channel, &pos_text);

92
tests/unit/plugins/irc/test-irc-message.cpp
View File

@ -106,13 +106,14 @@ extern "C"
"4:jkl TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz ABC:1 DEF:2 GHI:" \
"3 JKL:4 MNO:5 PQR:6 STU:7 VWX:8 YT:9 :are supported by this server"
#define WEE_CHECK_PARSE(__tags, __message_without_tags, __nick, __host, \
__command, __channel, __arguments, __text, \
__pos_command, __pos_arguments, __pos_channel, \
__pos_text, __server, __message) \
#define WEE_CHECK_PARSE(__tags, __message_without_tags, __nick, __user, \
__host, __command, __channel, __arguments, \
__text, __pos_command, __pos_arguments, \
__pos_channel, __pos_text, __server, __message) \
tags = NULL; \
message_without_tags = NULL; \
nick = NULL; \
user = NULL; \
host = NULL; \
command = NULL; \
channel = NULL; \
@ -124,8 +125,8 @@ extern "C"
\
irc_message_parse (__server, __message, &tags, \
&message_without_tags, \
&nick, &host, &command, &channel, &arguments, \
&text, &pos_command, &pos_arguments, \
&nick, &user, &host, &command, &channel, \
&arguments, &text, &pos_command, &pos_arguments, \
&pos_channel, &pos_text); \
\
if (__tags == NULL) \
@ -152,6 +153,14 @@ extern "C"
{ \
STRCMP_EQUAL(__nick, nick); \
} \
if (__user == NULL) \
{ \
POINTERS_EQUAL(NULL, user); \
} \
else \
{ \
STRCMP_EQUAL(__user, user); \
} \
if (__host == NULL) \
{ \
POINTERS_EQUAL(NULL, host); \
@ -225,29 +234,30 @@ TEST_GROUP(IrcMessage)
TEST(IrcMessage, Parse)
{
char *tags, *message_without_tags, *nick, *host, *command, *channel;
char *tags, *message_without_tags, *nick, *user, *host, *command, *channel;
char *arguments, *text;
int pos_command, pos_arguments, pos_channel, pos_text;
WEE_CHECK_PARSE(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
WEE_CHECK_PARSE(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-1, -1, -1, -1,
NULL, NULL);
WEE_CHECK_PARSE(NULL, "", NULL, NULL, NULL, NULL, NULL, NULL,
WEE_CHECK_PARSE(NULL, "", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-1, -1, -1, -1,
NULL, "");
WEE_CHECK_PARSE(NULL, ":nick!user@host", "nick", "nick!user@host", NULL,
NULL, NULL, NULL,
WEE_CHECK_PARSE(NULL, ":nick!user@host", "nick", "user", "nick!user@host",
NULL, NULL, NULL, NULL,
-1, -1, -1, -1,
NULL, ":nick!user@host");
/* AWAY */
WEE_CHECK_PARSE(NULL, ":nick!user@host AWAY", "nick", "nick!user@host",
WEE_CHECK_PARSE(NULL, ":nick!user@host AWAY", "nick", "user",
"nick!user@host",
"AWAY", NULL, NULL, NULL,
16, -1, -1, -1,
NULL, ":nick!user@host AWAY");
WEE_CHECK_PARSE(NULL, ":nick!user@host AWAY :I am away", "nick",
WEE_CHECK_PARSE(NULL, ":nick!user@host AWAY :I am away", "nick", "user",
"nick!user@host", "AWAY", NULL, ":I am away", "I am away",
16, 21, -1, 22,
NULL, ":nick!user@host AWAY :I am away");
@ -255,7 +265,7 @@ TEST(IrcMessage, Parse)
/* CAP */
WEE_CHECK_PARSE(NULL,
":irc.example.com CAP * LS :identify-msg multi-prefix sasl",
"irc.example.com", "irc.example.com", "CAP", "*",
"irc.example.com", NULL, "irc.example.com", "CAP", "*",
"* LS :identify-msg multi-prefix sasl",
"LS :identify-msg multi-prefix sasl",
17, 21, 21, 23,
@ -263,105 +273,106 @@ TEST(IrcMessage, Parse)
":irc.example.com CAP * LS :identify-msg multi-prefix sasl");
/* JOIN */
WEE_CHECK_PARSE(NULL, ":nick!user@host JOIN #channel", "nick",
WEE_CHECK_PARSE(NULL, ":nick!user@host JOIN #channel", "nick", "user",
"nick!user@host", "JOIN", "#channel", "#channel", NULL,
16, 21, 21, -1,
NULL, ":nick!user@host JOIN #channel");
/* JOIN with colon */
WEE_CHECK_PARSE(NULL, ":nick!user@host JOIN :#channel", "nick",
WEE_CHECK_PARSE(NULL, ":nick!user@host JOIN :#channel", "nick", "user",
"nick!user@host", "JOIN", "#channel", ":#channel", NULL,
16, 21, 22, -1,
NULL, ":nick!user@host JOIN :#channel");
/* JOIN with extended join capability */
WEE_CHECK_PARSE(NULL, ":nick!user@host JOIN #channel account :real name",
"nick", "nick!user@host", "JOIN", "#channel",
"nick", "user", "nick!user@host", "JOIN", "#channel",
"#channel account :real name", "account :real name",
16, 21, 21, 30,
NULL, ":nick!user@host JOIN #channel account :real name");
/* KICK */
WEE_CHECK_PARSE(NULL, ":nick1!user@host KICK #channel nick2 :kick reason",
"nick1", "nick1!user@host", "KICK", "#channel",
"nick1", "user", "nick1!user@host", "KICK", "#channel",
"#channel nick2 :kick reason", "nick2 :kick reason",
17, 22, 22, 31,
NULL, ":nick1!user@host KICK #channel nick2 :kick reason");
/* MODE */
WEE_CHECK_PARSE(NULL, ":nick!user@host MODE #channel +o nick",
"nick", "nick!user@host", "MODE", "#channel",
"nick", "user", "nick!user@host", "MODE", "#channel",
"#channel +o nick", "+o nick",
16, 21, 21, 30,
NULL, ":nick!user@host MODE #channel +o nick");
/* MODE with colon */
WEE_CHECK_PARSE(NULL, ":nick!user@host MODE #channel :+o nick",
"nick", "nick!user@host", "MODE", "#channel",
"nick", "user", "nick!user@host", "MODE", "#channel",
"#channel :+o nick", "+o nick",
16, 21, 21, 31,
NULL, ":nick!user@host MODE #channel :+o nick");
/* NICK */
WEE_CHECK_PARSE(NULL, ":oldnick!user@host NICK :newnick",
"oldnick", "oldnick!user@host", "NICK", NULL,
"oldnick", "user", "oldnick!user@host", "NICK", NULL,
":newnick", "newnick",
19, 24, -1, 25,
NULL, ":oldnick!user@host NICK :newnick");
/* NOTICE */
WEE_CHECK_PARSE(NULL, "NOTICE AUTH :*** Looking up your hostname...",
"AUTH", NULL, "NOTICE", "AUTH",
"AUTH", NULL, NULL, "NOTICE", "AUTH",
"AUTH :*** Looking up your hostname...",
"*** Looking up your hostname...",
0, 7, 7, 13,
NULL, "NOTICE AUTH :*** Looking up your hostname...");
/* PING */
WEE_CHECK_PARSE(NULL, "PING :arguments", NULL, NULL, "PING", NULL,
WEE_CHECK_PARSE(NULL, "PING :arguments", NULL, NULL, NULL, "PING", NULL,
":arguments", "arguments",
0, 5, -1, 6,
NULL, "PING :arguments");
/* PART */
WEE_CHECK_PARSE(NULL, ":nick!user@host PART #channel", "nick",
WEE_CHECK_PARSE(NULL, ":nick!user@host PART #channel", "nick", "user",
"nick!user@host", "PART", "#channel", "#channel", NULL,
16, 21, 21, -1,
NULL, ":nick!user@host PART #channel");
/* PART with colon */
WEE_CHECK_PARSE(NULL, ":nick!user@host PART :#channel", "nick",
WEE_CHECK_PARSE(NULL, ":nick!user@host PART :#channel", "nick", "user",
"nick!user@host", "PART", "#channel", ":#channel", NULL,
16, 21, 22, -1,
NULL, ":nick!user@host PART :#channel");
/* INVITE */
WEE_CHECK_PARSE(NULL, ":nick!user@host INVITE nick2 #channel", "nick",
"nick!user@host", "INVITE", "#channel", "nick2 #channel",
"user", "nick!user@host", "INVITE", "#channel",
"nick2 #channel",
NULL,
16, 23, 29, -1,
NULL, ":nick!user@host INVITE nick2 #channel");
/* PRIVMSG */
WEE_CHECK_PARSE(NULL, ":nick PRIVMSG", "nick", "nick",
WEE_CHECK_PARSE(NULL, ":nick PRIVMSG", "nick", NULL, "nick",
"PRIVMSG", NULL, NULL, NULL,
6, -1, -1, -1,
NULL, ":nick PRIVMSG");
WEE_CHECK_PARSE(NULL, ":nick@host PRIVMSG", "nick", "nick@host",
WEE_CHECK_PARSE(NULL, ":nick@host PRIVMSG", "nick", NULL, "nick@host",
"PRIVMSG", NULL, NULL, NULL,
11, -1, -1, -1,
NULL, ":nick@host PRIVMSG");
WEE_CHECK_PARSE(NULL, ":nick!user@host PRIVMSG", "nick", "nick!user@host",
WEE_CHECK_PARSE(NULL, ":nick!user@host PRIVMSG", "nick", "user",
"nick!user@host",
"PRIVMSG", NULL, NULL, NULL,
16, -1, -1, -1,
NULL, ":nick!user@host PRIVMSG");
WEE_CHECK_PARSE(NULL, ":nick!user@host PRIVMSG #channel", "nick",
WEE_CHECK_PARSE(NULL, ":nick!user@host PRIVMSG #channel", "nick", "user",
"nick!user@host", "PRIVMSG", "#channel", "#channel", NULL,
16, 24, 24, -1,
NULL, ":nick!user@host PRIVMSG #channel");
WEE_CHECK_PARSE(NULL, ":nick!user@host PRIVMSG #channel :the message",
"nick", "nick!user@host", "PRIVMSG", "#channel",
"nick", "user", "nick!user@host", "PRIVMSG", "#channel",
"#channel :the message", "the message",
16, 24, 24, 34,
NULL, ":nick!user@host PRIVMSG #channel :the message");
@ -369,7 +380,7 @@ TEST(IrcMessage, Parse)
/* PRIVMSG with tags */
WEE_CHECK_PARSE("time=2019-08-03T12:13:00.000Z",
":nick!user@host PRIVMSG #channel :the message",
"nick", "nick!user@host", "PRIVMSG", "#channel",
"nick", "user", "nick!user@host", "PRIVMSG", "#channel",
"#channel :the message", "the message",
47, 55, 55, 65,
NULL,
@ -379,7 +390,7 @@ TEST(IrcMessage, Parse)
/* PRIVMSG with tags and extra spaces*/
WEE_CHECK_PARSE("time=2019-08-03T12:13:00.000Z",
":nick!user@host PRIVMSG #channel :the message",
"nick", "nick!user@host", "PRIVMSG", "#channel",
"nick", "user", "nick!user@host", "PRIVMSG", "#channel",
"#channel :the message", "the message",
49, 58, 58, 69,
NULL,
@ -388,7 +399,7 @@ TEST(IrcMessage, Parse)
/* PRIVMSG to a nick */
WEE_CHECK_PARSE(NULL, ":nick!user@host PRIVMSG nick2 :the message",
"nick", "nick!user@host", "PRIVMSG", "nick2",
"nick", "user", "nick!user@host", "PRIVMSG", "nick2",
"nick2 :the message", "the message",
16, 24, 24, 31,
NULL, ":nick!user@host PRIVMSG nick2 :the message");
@ -400,7 +411,8 @@ TEST(IrcMessage, Parse)
"KICKLEN=450 CHANNELLEN=30 KEYLEN=23 CHANTYPES=# "
"PREFIX=(ov)@+ CASEMAPPING=ascii CAPAB IRCD=dancer "
":are available on this server",
"irc.example.com", "irc.example.com", "005", "mynick",
"irc.example.com", NULL, "irc.example.com", "005",
"mynick",
"mynick MODES=4 CHANLIMIT=#:20 NICKLEN=16 USERLEN=10 "
"HOSTLEN=63 TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 "
"KEYLEN=23 CHANTYPES=# PREFIX=(ov)@+ CASEMAPPING=ascii "
@ -420,7 +432,8 @@ TEST(IrcMessage, Parse)
/* 301 */
WEE_CHECK_PARSE(NULL,
":irc.example.com 301 mynick nick :away message for nick",
"irc.example.com", "irc.example.com", "301", "mynick",
"irc.example.com", NULL, "irc.example.com", "301",
"mynick",
"mynick nick :away message for nick",
"nick :away message for nick",
17, 21, 21, 28,
@ -430,7 +443,7 @@ TEST(IrcMessage, Parse)
/* error */
WEE_CHECK_PARSE(NULL,
"404 nick #channel :Cannot send to channel",
"nick", NULL, "404", "#channel",
"nick", NULL, NULL, "404", "#channel",
"nick #channel :Cannot send to channel",
"Cannot send to channel",
0, 4, 9, 19,
@ -438,7 +451,8 @@ TEST(IrcMessage, Parse)
"404 nick #channel :Cannot send to channel");
WEE_CHECK_PARSE(NULL,
":irc.example.com 404 nick #channel :Cannot send to channel",
"irc.example.com", "irc.example.com", "404", "#channel",
"irc.example.com", NULL, "irc.example.com", "404",
"#channel",
"nick #channel :Cannot send to channel",
"Cannot send to channel",
17, 21, 26, 36,