Add note about regex (split into 2 regex) in /help filter

14 files changed, 97 insertions, 66 deletions

diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index e56329e71..6eae46426 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -127,41 +127,42 @@
 ........................................
   Filterfunktion um Nachrichten in Buffern zu verbergen oder anzuzeigen, dazu können Tags oder regulären Ausdrücken verwendet werden
 
-           list: alle Filter auflisten
-         enable: aktiviert den Filter (Filter sind standardmäßig aktiviert)
-        disable: deaktiviert den Filter
-         toggle: Filterfunktion ein-/ausschalten
-           name: Filtername
-            add: fügt einen Filter hinzu
-            del: entfernt einen Filter
-           -all: entfernt alle Filter
-  plugin.buffer: Erweiterung und Buffer in denen die Filterfunktion aktiviert ist ("*" betrifft alle Buffer)
-           tags: durch Kommata  getrennte Liste mit Tags, Beispiel: "irc_join,irc_part,irc_quit"
-          regex: regulärer Ausdruck um in einer Zeile zu suchen
-                 - nutze '\t' um Präfix von Nachricht zu trennen. Sonderzeichen wie '|' müssen in einer Escapesequenz : '\|' eingebunden werden)
-                 - falls ein regulärer Ausdruck mit '!' beginnt dann wird das übereinstimmende Ergebnis umgekehrt  (nutze '\!' um mit '!' zu beginnen)
+           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
+  plugin.buffer: plugin and buffer where filter is active ("*" for all buffers)
+           tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
+          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 '!')
+                 note: two regex are created: one for prefix and one for message
   
-  Die Tastenvoreinstellung alt+'=' schaltet die Filterfunktion an/aus.
+  The default key alt+'=' toggles filtering on/off.
   
-  Die am häufigsten gebrauchten Tags lauten:
+  Tags most commonly used:
     no_filter, no_highlight, log0..log9 (log level),
     notify_message, notify_private, notify_highlight,
-    irc_xxx (xxx ist der IRC Befehl oder die IRC Nummer, siehe /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+    irc_xxx (xxx is command name or number, see /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
   
-  Beispiele:
-    aktiviert einen einfachen IRC Filter für join/part/quit Nachrichten:
+  Examples:
+    use IRC smart filter for join/part/quit messages:
       /filter add irc_smart * 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 * toto\t
-    nur der Nick "tutu" wird im IRC Channel #test angezeigt:
-      /filter add tutu irc.freenode.#test * !tutu\t
-    filtert Zeilen die das Wort "spam" enthalten:
+    keep only nick "titi" on IRC channel #test:
+      /filter add titi irc.freenode.#test * !titi\t
+    filter lines containing word "spam":
       /filter add filterspam * * spam
-    filtert Zeilen die "weechat sucks" im IRC Channel #weechat enthalten:
+    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_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index 4a2ffead5..360343c2c 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -140,6 +140,7 @@
           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 '!')
+                 note: two regex are created: one for prefix and one for message
   
   The default key alt+'=' toggles filtering on/off.
   
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index 934d35d45..f028a4aed 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -140,6 +140,7 @@
              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 '!')
+                    note: deux regex sont créées: une pour le préfixe et une pour le message
   
   La touche par défaut alt+'=' active/désactive le filtrage.
   
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 1f57800b1..74f04aeb1 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -127,42 +127,43 @@
 ........................................
   filtra messaggi nei buffer, per nascondere/mostrare in base a tag o regexp
 
-           list: elenca tutti i filtri
-         enable: abilita filtri (i filtri sono abilitati di default)
-        disable: disabilita filtri
-         toggle: abilita/disabilita filtri
-           nome: nome del filtro
-            add: aggiunge un filtro
-            del: elimina un filtro
-           -all: elimina tutti i filtri
-  plugin.buffer: plugin e buffer in cui il filtro è attivo ("*" per tutti i buffer)
-            tag: elenco di tag separati da virgole, per esempio: "irc_join,irc_part,irc_quit"
-          regex: espressione regolare da cercare nella riga
-                 - utilizzare '	' per separare il prefisso dal messaggio, caratteri speciali come "|" devono essere preceduti dal carattere escape: '\|')
-                 - se l'espressione regolare inizia con '!', il risultato corrispondente viene invertito (usare '\!' per iniziare con '!')
+           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
+  plugin.buffer: plugin and buffer where filter is active ("*" for all buffers)
+           tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
+          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 '!')
+                 note: two regex are created: one for prefix and one for message
   
-  Il tasto predefinito alt+'=' abilita/disabilita il filtro.
+  The default key alt+'=' toggles filtering on/off.
   
-  Tag utilizzati di frequente:
-    no_filter, no_highlight, log0..log9 (livello di log),
+  Tags most commonly used:
+    no_filter, no_highlight, log0..log9 (log level),
     notify_message, notify_private, notify_highlight,
-    irc_xxx (xxx è il nome comando o il numero, consultare /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+    irc_xxx (xxx is command name or number, see /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
   
-  Esempi:
-    usa il filtro intelligente IRC per i messaggi di entrata/uscita/abbandono:
-       /filter add irc_smart * irc_smart_filter *
-    filtra tutti i messaggi entrata/uscita/abbandono di IRC:
-       /filter add joinquit * irc_join,irc_part,irc_quit *
-    filtra i nick visualizzati all'ingresso in un canale o con /names:
+  Examples:
+    use IRC smart filter for join/part/quit messages:
+      /filter add irc_smart * irc_smart_filter *
+    filter all IRC join/part/quit messages:
+      /filter add joinquit * irc_join,irc_part,irc_quit *
+    filter nicks displayed when joining channels or with /names:
       /filter add nicks * irc_366 *
-    filtra il nick "tizio" sul canale IRC #weechat
-      /filter add tizio irc.freenode.#esempio * tizio\t
-    filtra solo il nick "caio" sul canale IRC #test:
-      /filter add caio irc.freenode.#test * !caio\t
-    filtra le righe contententi la parola "spam":
+    filter nick "toto" on IRC channel #weechat:
+      /filter add toto irc.freenode.#weechat * toto\t
+    keep only nick "titi" on IRC channel #test:
+      /filter add titi irc.freenode.#test * !titi\t
+    filter lines containing word "spam":
       /filter add filterspam * * spam
-    filtra le righe contententi "weechat fa schifo" sul canale IRC #weechat:
-      /filter add schifo irc.freenode.#weechat * weechat fa schifo
+    filter lines containing "weechat sucks" on IRC channel #weechat:
+      /filter add sucks irc.freenode.#weechat * weechat sucks
 ........................................
 
 • *`/help`* `[comando | opzione]`::
diff --git a/po/cs.po b/po/cs.po
index a732744b4..3153a2738 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1046,6 +1046,7 @@ msgstr ""
 "[list] | [enable|disable|toggle [name]] | [add jméno plugin.buffer tags "
 "regex] | [del name|-all]"
 
+#, fuzzy
 msgid ""
 "         list: list all filters\n"
 "       enable: enable filters (filters are enabled by default)\n"
@@ -1064,6 +1065,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/de.po b/po/de.po
index dcb19a15f..e240c8bbb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Nils G. <weechatter@arcor.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1066,6 +1066,7 @@ msgstr ""
 "[list] | [enable|disable|toggle [name]] | [add name plugin.buffer tags "
 "regex] | [del name|-all]"
 
+#, fuzzy
 msgid ""
 "         list: list all filters\n"
 "       enable: enable filters (filters are enabled by default)\n"
@@ -1084,6 +1085,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/es.po b/po/es.po
index be5955d40..66977ffe2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1052,6 +1052,7 @@ msgstr ""
 "[list] | [enable|disable|toggle [nombre]] | [add nombre plugin.buffer "
 "etiquetas regex] | [del nombre|-all]"
 
+#, fuzzy
 msgid ""
 "         list: list all filters\n"
 "       enable: enable filters (filters are enabled by default)\n"
@@ -1070,6 +1071,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/fr.po b/po/fr.po
index c10a87829..e56aeab46 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
-"PO-Revision-Date: 2010-08-14 11:57+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
+"PO-Revision-Date: 2010-08-14 12:16+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -1072,6 +1072,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
@@ -1115,6 +1117,8 @@ msgstr ""
 "caractères spéciaux comme '|' doivent être échappés: '\\|'\n"
 "                  - si l'expression régulière commence par '!' alors le "
 "résultat est inversé (utiliser '\\!' pour démarrer par '!')\n"
+"                  note: deux regex sont créées: une pour le préfixe et une "
+"pour le message\n"
 "\n"
 "La touche par défaut alt+'=' active/désactive le filtrage.\n"
 "\n"
diff --git a/po/hu.po b/po/hu.po
index 0860cd351..87a15aee6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1039,6 +1039,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/it.po b/po/it.po
index 92820410c..64dee8c46 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1043,6 +1043,7 @@ msgstr ""
 "[list] | [enable|disable|toggle [nome]] | [add nome plugin.buffer tag regex] "
 "| [del nome|-all]"
 
+#, fuzzy
 msgid ""
 "         list: list all filters\n"
 "       enable: enable filters (filters are enabled by default)\n"
@@ -1061,6 +1062,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/pl.po b/po/pl.po
index aa266cfdf..ec0fccd47 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1058,6 +1058,7 @@ msgstr ""
 "[list] | [enable|disable|toggle [nazwa]] | [add nazwa wtyczka.bufor tagi "
 "regex] | [del nazwa|-all]"
 
+#, fuzzy
 msgid ""
 "         list: list all filters\n"
 "       enable: enable filters (filters are enabled by default)\n"
@@ -1076,6 +1077,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/ru.po b/po/ru.po
index 1f45e70b2..ea075513a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1047,6 +1047,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index dd9b95b65..8c557dbaa 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-08-14 11:55+0200\n"
+"POT-Creation-Date: 2010-08-14 12:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -896,6 +896,8 @@ msgid ""
 "like '|' must be escaped: '\\|'\n"
 "               - if regex starts with '!', then matching result is reversed "
 "(use '\\!' to start with '!')\n"
+"               note: two regex are created: one for prefix and one for "
+"message\n"
 "\n"
 "The default key alt+'=' toggles filtering on/off.\n"
 "\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 0221c8543..616d6c933 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -4617,7 +4617,9 @@ command_init ()
                      "               - use '\\t' to separate prefix from message, special "
                      "chars like '|' must be escaped: '\\|'\n"
                      "               - if regex starts with '!', then matching "
-                     "result is reversed (use '\\!' to start with '!')\n\n"
+                     "result is reversed (use '\\!' to start with '!')\n"
+                     "               note: two regex are created: one for prefix "
+                     "and one for message\n\n"
                      "The default key alt+'=' toggles filtering on/off.\n\n"
                      "Tags most commonly used:\n"
                      "  no_filter, no_highlight, log0..log9 (log level),\n"