core: add logical "and" between tags in filters, weechat.look.highlight_tags and buffer property "highlight_tags"

The logical "and" is made with the separator "+".

Example: "irc_notice+nick_toto,nick_test"
will match a notice from nick "toto" or any message from nick "test".

18 files changed, 107 insertions, 84 deletions

diff --git a/doc/de/autogen/plugin_api/hdata.txt b/doc/de/autogen/plugin_api/hdata.txt
index 38b1de8b9..579619e60 100644
--- a/doc/de/autogen/plugin_api/hdata.txt
+++ b/doc/de/autogen/plugin_api/hdata.txt
@@ -539,7 +539,7 @@
 *** 'highlight_regex_compiled' (pointer)
 *** 'highlight_tags' (string)
 *** 'highlight_tags_count' (integer)
-*** 'highlight_tags_array' (string, array_size: "highlight_tags_count")
+*** 'highlight_tags_array' (pointer, array_size: "highlight_tags_count")
 *** 'hotlist_max_level_nicks' (hashtable)
 *** 'keys' (pointer, hdata: "key")
 *** 'last_key' (pointer, hdata: "key")
@@ -659,7 +659,7 @@
 *** 'buffers' (pointer)
 *** 'tags' (string)
 *** 'tags_count' (integer)
-*** 'tags_array' (string, array_size: "tags_count")
+*** 'tags_array' (pointer, array_size: "tags_count")
 *** 'regex' (string)
 *** 'regex_prefix' (pointer)
 *** 'regex_message' (pointer)
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index 89b72fe2c..3ad41f3e4 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -282,48 +282,51 @@ Beispiele:
          add <name> <buffer>[,<buffer>...] <tags> <regex>
          del <name>|-all
 
-   list: alle Filter auflisten
- enable: Filter wird aktiviert (Filter werden standardmäßig aktiviert)
-disable: Filter deaktivieren
- toggle: Filter de-/aktivieren
-   name: Name des Filters
-    add: Filter hinzufügen
-    del: Filter entfernen
-   -all: entfernt alle Filter
- buffer: durch Kommata getrennte Liste von Buffer in denen der Filter aktiv sein soll:
-         - ist der vollständige Name eines Buffer inklusive seiner Erweiterung (Beispiel: "irc.freenode.#weechat")
-         - "*" anwenden auf alle Buffer
-         - beginnt ein Name mit '!' wird für diesen Buffer kein Filter genutzt
-         - ein Name darf mit '*' beginnen oder enden um mehrere Buffer auszuwählen
-   tags: durch Kommata  getrennte Liste von Schlagwörtern. Zum Beispiel: "irc_join,irc_part,irc_quit"
-  regex: regulärer Ausdruck um in einer Zeile zu suchen
-         - das Präfix (z.B. Nick) wird mittels '\t' von der Nachricht getrennt. Sonderzeichen wie '|' müssen mit einer Escapesequenz : '\|' eingebunden werden)
-         - wird ein regulärer Ausdruck mit '!' eingeleitet dann wird das übereinstimmende Ergebnis umgekehrt  (nutze '\!' um mit '!' zu beginnen)
-         - es werden zwei reguläre Ausdrücke erstellt: Der erste für den Präfix und der zweite für die eigentliche Nachricht
-         - reguläre Ausdrücke unterscheiden nicht zwischen Groß- und Kleinschreibung. Um zwischen Groß- und Kleinschreibung zu unterscheiden müssen diese mit "(?-i)" eingeleitet werden.
-
-Die Tastenvoreinstellung alt+'=' schaltet die Filterfunktion an/aus.
-
-Die am häufigsten gebrauchten Schlagwörter lauten:
-  no_filter, no_highlight, no_log, log0..log9 (log Level),
+   list: list all filters
+ enable: enable filters (filters are enabled by default)
+disable: disable filters
+ toggle: toggle filters
+   name: filter name
+    add: add a filter
+    del: delete a filter
+   -all: delete all filters
+ buffer: comma separated list of buffers where filter is active:
+         - this is full name including plugin (example: "irc.freenode.#weechat")
+         - "*" means all buffers
+         - a name starting with '!' is excluded
+         - name can start or end with '*' to match many buffers
+   tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
+         (it is possible to combine many tags as a logical "and" with separator "+", for example: "nick_toto+irc_action")
+  regex: regular expression to search in line
+         - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
+         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
+         - two regular expressions are created: one for prefix and one for message
+         - regex are case insensitive, they can start by "(?-i)" to become case sensitive
+
+The default key alt+'=' toggles filtering on/off.
+
+Tags most commonly used:
+  no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx ist durch den Nicknamen zu ersetzen), prefix_nick_ccc (ccc ist die Farbe mit der der Nick dargestellt wird),
-  irc_xxx (xxx ist durch einen IRC-Befehl/-Nummer zu ersetzen, siehe /server raw oder /debug tags)
+  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick),
+  irc_xxx (xxx is command name or number, see /server raw or /debug tags),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
-Mittels "/debug tags" kann man sich die Tags jeder einzelnen Zeile darstellen zu lassen.
+To see tags for lines in buffers: /debug tags
 
-Beispiele:
-  aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten für alle Buffer:
+Examples:
+  use IRC smart filter on all buffers:
     /filter add irc_smart * irc_smart_filter *
-  aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten der für alle Buffer genutzt wird, außer Buffer die "#weechat" im Namen tragen:
+  use IRC smart filter on all buffers except those with "#weechat" in name:
     /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  filtert alle IRC join/part/quit Nachrichten:
+  filter all IRC join/part/quit messages:
     /filter add joinquit * irc_join,irc_part,irc_quit *
-  filtert Nicks wenn diese den Channel betreten oder durch den Befehl "/names" angezeigt werden:
+  filter nicks displayed when joining channels or with /names:
     /filter add nicks * irc_366 *
-  filtert Nick "toto" im IRC Channel #weechat:
+  filter nick "toto" on IRC channel #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
-  filtert Zeilen die "weechat sucks" im IRC Channel #weechat enthalten:
+  filter IRC join/action messages from nick "toto":
+    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
+  filter lines containing "weechat sucks" on IRC channel #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ----
 
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index a64ef495c..30a388446 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -544,7 +544,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** Beschreibung: `durch Kommata getrennte Liste der hervorzuhebenden Wörter (Groß-/Kleinschreibung wird nicht beachtet. Beispiele: "irc_notice" für IRC Nachrichten, "nick_flashcode" für Nachrichten vom Nick "FlashCode")`
+** Beschreibung: `comma separated list of tags to highlight; case insensitive comparison; each tag can start or end with "*" to match more than one tag; many tags can be separated by "+" to make a logical "and" between tags; examples: "nick_flashcode" for messages from nick "FlashCode", "irc_notice+nick_toto*" for notices from a nick starting with "toto"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
diff --git a/doc/en/autogen/plugin_api/hdata.txt b/doc/en/autogen/plugin_api/hdata.txt
index 54b306489..5b8995aa5 100644
--- a/doc/en/autogen/plugin_api/hdata.txt
+++ b/doc/en/autogen/plugin_api/hdata.txt
@@ -539,7 +539,7 @@
 *** 'highlight_regex_compiled' (pointer)
 *** 'highlight_tags' (string)
 *** 'highlight_tags_count' (integer)
-*** 'highlight_tags_array' (string, array_size: "highlight_tags_count")
+*** 'highlight_tags_array' (pointer, array_size: "highlight_tags_count")
 *** 'hotlist_max_level_nicks' (hashtable)
 *** 'keys' (pointer, hdata: "key")
 *** 'last_key' (pointer, hdata: "key")
@@ -659,7 +659,7 @@
 *** 'buffers' (pointer)
 *** 'tags' (string)
 *** 'tags_count' (integer)
-*** 'tags_array' (string, array_size: "tags_count")
+*** 'tags_array' (pointer, array_size: "tags_count")
 *** 'regex' (string)
 *** 'regex_prefix' (pointer)
 *** 'regex_message' (pointer)
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index 3b875e726..eb22bd085 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -295,7 +295,8 @@ disable: disable filters
          - "*" means all buffers
          - a name starting with '!' is excluded
          - name can start or end with '*' to match many buffers
-   tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
+   tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
+         (it is possible to combine many tags as a logical "and" with separator "+", for example: "nick_toto+irc_action")
   regex: regular expression to search in line
          - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
          - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
@@ -323,6 +324,8 @@ Examples:
     /filter add nicks * irc_366 *
   filter nick "toto" on IRC channel #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
+  filter IRC join/action messages from nick "toto":
+    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
   filter lines containing "weechat sucks" on IRC channel #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ----
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index c90b4c034..281b436b1 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -544,7 +544,7 @@
 ** values: any string (default value: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** description: `comma separated list of tags to highlight (case insensitive comparison, examples: "irc_notice" for IRC notices, "nick_flashcode" for messages from nick "FlashCode")`
+** description: `comma separated list of tags to highlight; case insensitive comparison; each tag can start or end with "*" to match more than one tag; many tags can be separated by "+" to make a logical "and" between tags; examples: "nick_flashcode" for messages from nick "FlashCode", "irc_notice+nick_toto*" for notices from a nick starting with "toto"`
 ** type: string
 ** values: any string (default value: `""`)
 
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index bce66cc4b..d93953b45 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -10155,6 +10155,8 @@ Arguments:
 
 | highlight_tags | comma separated list of tags |
   Comma separated list of tags to highlight in this buffer
+  (_WeeChat ≥ 0.4.3_: it is possible to combine many tags as a logical "and"
+  with separator "+", for example: "nick_toto+irc_action")
 
 | hotlist_max_level_nicks | comma separated list of "nick:level" |
   Comma separated list of nicks with max level for hotlist on this buffer
diff --git a/doc/fr/autogen/plugin_api/hdata.txt b/doc/fr/autogen/plugin_api/hdata.txt
index 648dea204..346260692 100644
--- a/doc/fr/autogen/plugin_api/hdata.txt
+++ b/doc/fr/autogen/plugin_api/hdata.txt
@@ -539,7 +539,7 @@
 *** 'highlight_regex_compiled' (pointer)
 *** 'highlight_tags' (string)
 *** 'highlight_tags_count' (integer)
-*** 'highlight_tags_array' (string, array_size: "highlight_tags_count")
+*** 'highlight_tags_array' (pointer, array_size: "highlight_tags_count")
 *** 'hotlist_max_level_nicks' (hashtable)
 *** 'keys' (pointer, hdata: "key")
 *** 'last_key' (pointer, hdata: "key")
@@ -659,7 +659,7 @@
 *** 'buffers' (pointer)
 *** 'tags' (string)
 *** 'tags_count' (integer)
-*** 'tags_array' (string, array_size: "tags_count")
+*** 'tags_array' (pointer, array_size: "tags_count")
 *** 'regex' (string)
 *** 'regex_prefix' (pointer)
 *** 'regex_message' (pointer)
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index 2887e5102..0605b21c6 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -296,6 +296,7 @@ disable: désactiver les filtres
          - un nom commençant par '!' est exclu
          - le nom peut commencer ou se terminer par '*' pour plusieurs tampons
    tags: liste de tags, séparés par des virgules, par exemple: "irc_join,irc_part,irc_quit"
+         (il est possible de combiner plusieurs tags sous forme d'un "et" logique avec le séparateur "+", par exemple: "nick_toto+irc_action")
   regex: expression régulière à rechercher dans la ligne
          - utiliser '\t' pour séparer le préfixe du message, les caractères spéciaux comme '|' doivent être échappés: '\|'
          - si l'expression régulière commence par '!' alors le résultat est inversé (utiliser '\!' pour démarrer par '!')
@@ -323,6 +324,8 @@ Exemples:
     /filter add nicks * irc_366 *
   filtrer le pseudo "toto" sur le canal IRC #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
+  filtrer les messages IRC join/action du pseudo "toto":
+    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
   filtrer les lignes contenant "weechat sucks" sur le canal IRC #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ----
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 4db2af1fa..1195e9276 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -544,7 +544,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** description: `liste des tags pour la notification (séparés par des virgules, la comparaison ne tient pas compte de la casse, exemples: "irc_notice" pour les notices IRC, "nick_flashcode" pour les messages du pseudo "FlashCode")`
+** description: `liste des tags pour la notification (séparés par des virgules); la comparaison ne tient pas compte de la casse; chaque tag peut commencer ou se terminer par "*" pour correspondre à plus d'un tag; plusieurs tags peuvent être séparés par "+" pour faire un "et" logique entre les tags; exemples: "nick_flashcode" pour les messages du pseudo "FlashCode", "irc_notice+nick_toto*" pour les notices d'un pseudo commençant par "toto"`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index 1fa1233b0..f8bb13ca4 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -10335,6 +10335,9 @@ Paramètres :
 
 | highlight_tags | liste d'étiquettes ("tags") séparées par des virgules |
   Liste d'étiquettes ("tags") à mettre en valeur pour ce tampon
+  (_WeeChat ≥ 0.4.3_ : il est possible de combiner plusieurs tags sous forme
+  d'un "et" logique avec le séparateur "+", par exemple :
+  "nick_toto+irc_action")
 
 | hotlist_max_level_nicks | liste de "pseudo:niveau" séparés par des virgules |
   Liste de pseudos avec niveau max pour la hotlist sur ce tampon (le niveau peut
diff --git a/doc/it/autogen/plugin_api/hdata.txt b/doc/it/autogen/plugin_api/hdata.txt
index 0a3f3cbc4..2b62596bc 100644
--- a/doc/it/autogen/plugin_api/hdata.txt
+++ b/doc/it/autogen/plugin_api/hdata.txt
@@ -539,7 +539,7 @@
 *** 'highlight_regex_compiled' (pointer)
 *** 'highlight_tags' (string)
 *** 'highlight_tags_count' (integer)
-*** 'highlight_tags_array' (string, array_size: "highlight_tags_count")
+*** 'highlight_tags_array' (pointer, array_size: "highlight_tags_count")
 *** 'hotlist_max_level_nicks' (hashtable)
 *** 'keys' (pointer, hdata: "key")
 *** 'last_key' (pointer, hdata: "key")
@@ -659,7 +659,7 @@
 *** 'buffers' (pointer)
 *** 'tags' (string)
 *** 'tags_count' (integer)
-*** 'tags_array' (string, array_size: "tags_count")
+*** 'tags_array' (pointer, array_size: "tags_count")
 *** 'regex' (string)
 *** 'regex_prefix' (pointer)
 *** 'regex_message' (pointer)
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index dfb647f90..49381a192 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -295,7 +295,8 @@ disable: disable filters
          - "*" means all buffers
          - a name starting with '!' is excluded
          - name can start or end with '*' to match many buffers
-   tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
+   tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
+         (it is possible to combine many tags as a logical "and" with separator "+", for example: "nick_toto+irc_action")
   regex: regular expression to search in line
          - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
          - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
@@ -323,6 +324,8 @@ Examples:
     /filter add nicks * irc_366 *
   filter nick "toto" on IRC channel #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
+  filter IRC join/action messages from nick "toto":
+    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
   filter lines containing "weechat sucks" on IRC channel #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ----
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index d63e84b34..d833094dd 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -544,7 +544,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** descrizione: `elenco separato da virgole di tag da notificare (confronto non sensibile alle maiuscole, esempi: "irc_notice" per gli annunci IRC, "nick_flashcode" per i messaggi dal nick "FlashCode")`
+** descrizione: `comma separated list of tags to highlight; case insensitive comparison; each tag can start or end with "*" to match more than one tag; many tags can be separated by "+" to make a logical "and" between tags; examples: "nick_flashcode" for messages from nick "FlashCode", "irc_notice+nick_toto*" for notices from a nick starting with "toto"`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt
index 23d90ac9f..0005870fa 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -10322,8 +10322,11 @@ Argomenti:
 | highlight_regex | qualsiasi stringa |
   Espressione regolare per l'evento
 
+// TRANSLATION MISSING
 | highlight_tags | elenco separato da virgole di tag |
   Elenco separato da virgole di tag da evidenziare in questo buffer
+  (_WeeChat ≥ 0.4.3_: it is possible to combine many tags as a logical "and"
+  with separator "+", for example: "nick_toto+irc_action")
 
 | hotlist_max_level_nicks | elenco separado da virgole di "nick:livello" |
   Elenco separato da virgole di nick con il livello massimo per la hotlist
diff --git a/doc/ja/autogen/plugin_api/hdata.txt b/doc/ja/autogen/plugin_api/hdata.txt
index 1847d0511..37e41f79b 100644
--- a/doc/ja/autogen/plugin_api/hdata.txt
+++ b/doc/ja/autogen/plugin_api/hdata.txt
@@ -539,7 +539,7 @@
 *** 'highlight_regex_compiled' (pointer)
 *** 'highlight_tags' (string)
 *** 'highlight_tags_count' (integer)
-*** 'highlight_tags_array' (string, array_size: "highlight_tags_count")
+*** 'highlight_tags_array' (pointer, array_size: "highlight_tags_count")
 *** 'hotlist_max_level_nicks' (hashtable)
 *** 'keys' (pointer, hdata: "key")
 *** 'last_key' (pointer, hdata: "key")
@@ -659,7 +659,7 @@
 *** 'buffers' (pointer)
 *** 'tags' (string)
 *** 'tags_count' (integer)
-*** 'tags_array' (string, array_size: "tags_count")
+*** 'tags_array' (pointer, array_size: "tags_count")
 *** 'regex' (string)
 *** 'regex_prefix' (pointer)
 *** 'regex_message' (pointer)
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index 4ac89ec87..9bbf7adee 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -282,48 +282,51 @@ Examples:
          add <name> <buffer>[,<buffer>...] <tags> <regex>
          del <name>|-all
 
-   list: 全てのフィルタをリストアップ
- enable: フィルタを有効化 (フィルタはデフォルトで有効になっています)
-disable: フィルタを無効化
- toggle: フィルタの有効無効を切り替え
-   name: フィルタの名前
-    add: フィルタを追加
-    del: フィルタを削除
-   -all: 全てのフィルタを削除
- buffer: フィルタが有効化されているバッファのコンマ区切りリスト:
-         - これはプラグイン名を含む完全な名前です (例えば: "irc.freenode.#weechat")
-         - "*" は全てのバッファを意味します
-         - 名前が '!' から始まるものは除外されます
-         - 多くのバッファにマッチさせるためには名前を '*' から始めるか終わらせてください
-   tags: タグのコンマ区切りリスト、例えば: "irc_join,irc_part,irc_quit"
-  regex: 行単位検索の正規表現
-         - '\t' を使うと、プレフィックスをメッセージから分離できます。'|' 等の特別な文字は '\|' のようにエスケープしなければいけません
-         - 正規表現の最初に '!' が含まれる場合は、マッチ結果が反転されます (最初の '!' にマッチさせたければ、'\!' を使ってください)
-         - 2 種類の正規表現があります: 一方はプレフィックス用、他方はメッセージ用
-         - 正規表現は大文字小文字を区別しません、"(?-i)" から始まる場合は区別します
-
-デフォルトではキー alt+'=' でフィルタリングの on/off を切り替えられます。
-
-よく使われるタグ:
+   list: list all filters
+ enable: enable filters (filters are enabled by default)
+disable: disable filters
+ toggle: toggle filters
+   name: filter name
+    add: add a filter
+    del: delete a filter
+   -all: delete all filters
+ buffer: comma separated list of buffers where filter is active:
+         - this is full name including plugin (example: "irc.freenode.#weechat")
+         - "*" means all buffers
+         - a name starting with '!' is excluded
+         - name can start or end with '*' to match many buffers
+   tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
+         (it is possible to combine many tags as a logical "and" with separator "+", for example: "nick_toto+irc_action")
+  regex: regular expression to search in line
+         - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
+         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
+         - two regular expressions are created: one for prefix and one for message
+         - regex are case insensitive, they can start by "(?-i)" to become case sensitive
+
+The default key alt+'=' toggles filtering on/off.
+
+Tags most commonly used:
   no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx はメッセージのニックネーム), prefix_nick_ccc (ccc はニックネームの色)
-  irc_xxx (xxx はコマンド名又は番号、/server raw または /debug tags で確認),
+  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick),
+  irc_xxx (xxx is command name or number, see /server raw or /debug tags),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
-バッファ内でタグを見るには: /debug tags
+To see tags for lines in buffers: /debug tags
 
-例:
-  全てのバッファで IRC スマートフィルタを使用:
+Examples:
+  use IRC smart filter on all buffers:
     /filter add irc_smart * irc_smart_filter *
-  名前に "#weechat" を含むバッファを除いた全てのバッファで IRC スマートフィルタを使用:
+  use IRC smart filter on all buffers except those with "#weechat" in name:
     /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  全ての IRC join/part/quit メッセージをフィルタ:
+  filter all IRC join/part/quit messages:
     /filter add joinquit * irc_join,irc_part,irc_quit *
-  チャンネルに入った時や /names で表示されるニックネームをフィルタ:
+  filter nicks displayed when joining channels or with /names:
     /filter add nicks * irc_366 *
-  IRC チャンネル #weechat で "toto" を含むニックネームをフィルタ:
+  filter nick "toto" on IRC channel #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
-  IRC チャンネル #weechat で "weechat sucks" を含む行をフィルタ:
+  filter IRC join/action messages from nick "toto":
+    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
+  filter lines containing "weechat sucks" on IRC channel #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
 ----
 
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index f53a1ff11..2b44fae53 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -544,7 +544,7 @@
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** 説明: `ハイライトするタグのコンマ区切りリスト (大文字小文字の区別無し、例: IRC notices には "irc_notice"、ニックネーム "FlashCode" からのメッセージには "nick_flashcode")`
+** 説明: `comma separated list of tags to highlight; case insensitive comparison; each tag can start or end with "*" to match more than one tag; many tags can be separated by "+" to make a logical "and" between tags; examples: "nick_flashcode" for messages from nick "FlashCode", "irc_notice+nick_toto*" for notices from a nick starting with "toto"`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)