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".

12 files changed, 239 insertions, 92 deletions

diff --git a/po/cs.po b/po/cs.po
index 3bbd4c5a8..3eed065b6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1389,8 +1389,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1425,6 +1427,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2746,13 +2750,12 @@ msgstr ""
 "písmena, například: \"FlashCode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"čárkou oddělený seznam značek pro zvýraznění (neporovnává se velikost "
-"písmen, příklady: \"irc_notice\" pro IRC notifikace, \"nick_flashcode\" pro "
-"zprávy od přezdívky \"FlashCode\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -9943,6 +9946,15 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "čárkou oddělený seznam značek pro zvýraznění (neporovnává se velikost "
+#~ "písmen, příklady: \"irc_notice\" pro IRC notifikace, \"nick_flashcode\" "
+#~ "pro zprávy od přezdívky \"FlashCode\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "uložit/použít/resetovat rozložení bufferů a oken"
diff --git a/po/de.po b/po/de.po
index a655e8c9b..e68413318 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-20 15:12+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -1492,6 +1492,7 @@ msgstr ""
 "list || enable|disable|toggle [<name>] || add <name> <buffer>[,<buffer>...] "
 "<tags> <regex> || del <name>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1507,8 +1508,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1543,6 +1546,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -3152,13 +3157,12 @@ msgstr ""
 "\"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"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\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -10996,6 +11000,15 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Konstanten"
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "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\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "Layout für Buffer und Fenster speichern, anwenden oder zurücksetzen"
diff --git a/po/es.po b/po/es.po
index dd2fa8cab..54ea402f8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1428,8 +1428,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1464,6 +1466,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2904,13 +2908,12 @@ msgstr ""
 "\"FlashCode|flashy\", \"(?-i)Flascode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"lista separada por comas de palabras a resaltar (comparación insensible a "
-"mayúsculas, ejemplos: \"irc_notice\" para avisos IRC, \"nick_flashcode\" "
-"para mensajes del apodo \"FlashCode\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -10205,6 +10208,15 @@ msgstr "Tipo"
 msgid "Constants"
 msgstr "Constantes"
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "lista separada por comas de palabras a resaltar (comparación insensible a "
+#~ "mayúsculas, ejemplos: \"irc_notice\" para avisos IRC, \"nick_flashcode\" "
+#~ "para mensajes del apodo \"FlashCode\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "guardar/aplicar/reiniciar el esquema de las ventanas y buffers"
diff --git a/po/fr.po b/po/fr.po
index a5333230e..1968b5233 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
-"PO-Revision-Date: 2013-12-13 12:44+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
+"PO-Revision-Date: 2013-12-14 10:23+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1491,8 +1491,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1527,6 +1529,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -1548,6 +1552,8 @@ msgstr ""
 "tampons\n"
 "   tags: liste de tags, séparés par des virgules, par exemple: \"irc_join,"
 "irc_part,irc_quit\"\n"
+"         (il est possible de combiner plusieurs tags sous forme d'un \"et\" "
+"logique avec le séparateur \"+\", par exemple: \"nick_toto+irc_action\")\n"
 "  regex: expression régulière à rechercher dans la ligne\n"
 "         - utiliser '\\t' pour séparer le préfixe du message, les caractères "
 "spéciaux comme '|' doivent être échappés: '\\|'\n"
@@ -1583,6 +1589,8 @@ msgstr ""
 "    /filter add nicks * irc_366 *\n"
 "  filtrer le pseudo \"toto\" sur le canal IRC #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filtrer les messages IRC join/action du pseudo \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filtrer les lignes contenant \"weechat sucks\" sur le canal IRC #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 
@@ -3071,14 +3079,19 @@ msgstr ""
 "i)FlashCode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"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"
-"\")"
+"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"
+"\""
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -10743,6 +10756,16 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Constantes"
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "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\")"
+
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "gérer les dispositions des tampons et fenêtres"
 
diff --git a/po/hu.po b/po/hu.po
index 71be6e8bf..019a99a96 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1313,8 +1313,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1349,6 +1351,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2387,14 +2391,13 @@ msgid ""
 "i)FlashCode|flashy\""
 msgstr ""
 
-#, fuzzy
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"kiemelendő szavak vesszővel elválasztott listája (kis/nagybetűtől független "
-"összehasonlítás, a szavak végére/elejére \"*\"-ot illesztve részleges keresés"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -9364,3 +9367,13 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "kiemelendő szavak vesszővel elválasztott listája (kis/nagybetűtől "
+#~ "független összehasonlítás, a szavak végére/elejére \"*\"-ot illesztve "
+#~ "részleges keresés"
diff --git a/po/it.po b/po/it.po
index b94b52c01..d33c9f299 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1462,8 +1462,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1498,6 +1500,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2993,13 +2997,12 @@ msgstr ""
 "i)Flashcode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"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\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -10353,6 +10356,15 @@ msgstr "Tipo"
 msgid "Constants"
 msgstr "Costanti"
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "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\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "salva/applica/ripristina il layout per i buffer e le finestre"
diff --git a/po/ja.po b/po/ja.po
index 3163a5338..89ddd2262 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -1431,6 +1431,7 @@ msgstr ""
 "list || enable|disable|toggle [<name>] || add <name> <buffer>[,<buffer>...] "
 "<tags> <regex> || del <name>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1446,8 +1447,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1482,6 +1485,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2967,13 +2972,12 @@ msgstr ""
 "i)FlashCode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"ハイライトするタグのコンマ区切りリスト (大文字小文字の区別無し、例: IRC "
-"notices には \"irc_notice\"、ニックネーム \"FlashCode\" からのメッセージには "
-"\"nick_flashcode\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -10328,6 +10332,15 @@ msgstr "タイプ"
 msgid "Constants"
 msgstr "定数"
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "ハイライトするタグのコンマ区切りリスト (大文字小文字の区別無し、例: IRC "
+#~ "notices には \"irc_notice\"、ニックネーム \"FlashCode\" からのメッセージに"
+#~ "は \"nick_flashcode\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "バッファとウィンドウのレイアウトを保存/適用/リセット"
diff --git a/po/pl.po b/po/pl.po
index 34ba02d0b..ffb14fa79 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-11 09:07+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1468,6 +1468,7 @@ msgstr ""
 "list || enable|disable|toggle [<nazwa>] || add <nazwa> <bufor>[,<bufor>...] "
 "<tagi> <regex> || del <nazwa>|-all"
 
+#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1483,8 +1484,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1519,6 +1522,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -3039,13 +3044,12 @@ msgstr ""
 "znaczenie), przykłady: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"lista tagów do podświetlania oddzielona przecinkami (porównanie wrażliwe na "
-"wielkość znaków, przykłady: \"irc_notice\" dla powiadomień IRC, "
-"\"nick_flashcode\" dla wiadomości od nicka \"FlashCode\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -10528,6 +10532,15 @@ msgstr "Typ"
 msgid "Constants"
 msgstr "Stałe"
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "lista tagów do podświetlania oddzielona przecinkami (porównanie wrażliwe "
+#~ "na wielkość znaków, przykłady: \"irc_notice\" dla powiadomień IRC, "
+#~ "\"nick_flashcode\" dla wiadomości od nicka \"FlashCode\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "zapisz/zatwierdź/zresetuj układ buforów i okien"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7849d45d5..45a9e7921 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: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1442,8 +1442,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1478,6 +1480,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2830,13 +2834,12 @@ msgstr ""
 "em conta maiúscula/minúscula, exemplo: \"FlashCode|flashy\""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"lista de marcações separada por vírgulas a serem destacadas (comparação sem "
-"levar em conta maiúscula/minúscula, exemplos: \"irc_notice\" for IRC "
-"notices, \"nick_flashcode\" para mensagens do apelido \"FlashCode\")"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -9573,6 +9576,15 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "lista de marcações separada por vírgulas a serem destacadas (comparação "
+#~ "sem levar em conta maiúscula/minúscula, exemplos: \"irc_notice\" for IRC "
+#~ "notices, \"nick_flashcode\" para mensagens do apelido \"FlashCode\")"
+
 #, fuzzy
 #~ msgid "manage layouts for buffers and windows"
 #~ msgstr "salvar/aplicar/resetar a disposição dos buffers e janelas"
diff --git a/po/ru.po b/po/ru.po
index 67711292e..08c87d6ea 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:18+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1335,8 +1335,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1371,6 +1373,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2410,14 +2414,13 @@ msgid ""
 "i)FlashCode|flashy\""
 msgstr ""
 
-#, fuzzy
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
-"разделённый запятыми список подсвечиваемых слов (регистр учитывается, слова "
-"могут начинаться или кончаться \"*\" для неполного соответствия)"
 
 msgid ""
 "add any buffer to hotlist (including current or visible buffers) if local "
@@ -9385,3 +9388,12 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of tags to highlight (case insensitive comparison, "
+#~ "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
+#~ "from nick \"FlashCode\")"
+#~ msgstr ""
+#~ "разделённый запятыми список подсвечиваемых слов (регистр учитывается, "
+#~ "слова могут начинаться или кончаться \"*\" для неполного соответствия)"
diff --git a/po/tr.po b/po/tr.po
index bc440c883..5e7f7f608 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-11-09 10:13+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1177,8 +1177,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1213,6 +1215,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2145,9 +2149,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
 
 msgid ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 67a2f68cb..82f00d4d1 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-12-13 12:43+0100\n"
+"POT-Creation-Date: 2013-12-14 10:20+0100\n"
 "PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1183,8 +1183,10 @@ msgid ""
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
 "         - name can start or end with '*' to match many buffers\n"
-"   tags: comma separated list of tags, for example: \"irc_join,irc_part,"
+"   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
+"         (it is possible to combine many tags as a logical \"and\" with "
+"separator \"+\", for example: \"nick_toto+irc_action\")\n"
 "  regex: regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1219,6 +1221,8 @@ msgid ""
 "    /filter add nicks * irc_366 *\n"
 "  filter nick \"toto\" on IRC channel #weechat:\n"
 "    /filter add toto irc.freenode.#weechat nick_toto *\n"
+"  filter IRC join/action messages from nick \"toto\":\n"
+"    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filter lines containing \"weechat sucks\" on IRC channel #weechat:\n"
 "    /filter add sucks irc.freenode.#weechat * weechat sucks"
 msgstr ""
@@ -2148,9 +2152,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"comma separated list of tags to highlight (case insensitive comparison, "
-"examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
-"from 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\""
 msgstr ""
 
 msgid ""