diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 68a01db2a..714fda3e1 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -77,6 +77,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * core: add signals "key_combo_{default|search|cursor}"
 * core: display a warning in case of inconsistency between the options
   weechat.look.save_{config|layout}_on_exit
+* api: allow wildcard "*" inside the mask in function string_match
 * api: allow value "-1" for property "hotlist" in function buffer_set (to remove
   a buffer from hotlist)
 * api: add option "buffer_flush" in function hook_process_hashtable
diff --git a/doc/de/autogen/plugin_api/infolists.txt b/doc/de/autogen/plugin_api/infolists.txt
index 982a73be0..a00a17d85 100644
--- a/doc/de/autogen/plugin_api/infolists.txt
+++ b/doc/de/autogen/plugin_api/infolists.txt
@@ -2,9 +2,9 @@
 |===
 | Erweiterung | Name | Beschreibung | Pointer | Argumente
 
-| alias | alias | Liste der Alias | Alias Pointer (optional) | Alias Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| alias | alias | Liste der Alias | Alias Pointer (optional) | alias name (wildcard "*" is allowed) (optional)
 
-| guile | guile_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| guile | guile_script | Liste der Skripten | Skript Pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
 | irc | irc_channel | Liste der Channels eines IRC-Servers | Channel Pointer (optional) | Server,Channel (Channel ist optional)
 
@@ -12,41 +12,41 @@
 
 | irc | irc_nick | Liste der Nicks im IRC-Channel | Nick Pointer (optional) | Server,Channel,Nick (Channel und Nick sind optional)
 
-| irc | irc_notify | Liste mit Benachrichtigungen | Benachrichtigungspointer (optional) | Servername (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| irc | irc_notify | Liste mit Benachrichtigungen | Benachrichtigungspointer (optional) | server name (wildcard "*" is allowed) (optional)
 
-| irc | irc_server | Liste der IRC-Server | Server Pointer (optional) | Servername (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| irc | irc_server | Liste der IRC-Server | Server Pointer (optional) | server name (wildcard "*" is allowed) (optional)
 
 | logger | logger_buffer | Auflistung der protokollierten Buffer | Logger Pointer (optional) | -
 
-| lua | lua_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| lua | lua_script | Liste der Skripten | Skript Pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| perl | perl_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| perl | perl_script | Liste der Skripten | Skript Pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| python | python_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| python | python_script | Liste der Skripten | Skript Pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
 | relay | relay | Liste der Relay-Clients | Relay Pointer (optional) | -
 
-| ruby | ruby_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| ruby | ruby_script | Liste der Skripten | Skript Pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| script | script_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes, mit Dateierweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| script | script_script | Liste der Skripten | Skript Pointer (optional) | script name with extension (wildcard "*" is allowed) (optional)
 
-| tcl | tcl_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| tcl | tcl_script | Liste der Skripten | Skript Pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| weechat | bar | Auflistung der Bars | Bar Pointer (optional) | Bar Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | bar | Auflistung der Bars | Bar Pointer (optional) | bar name (wildcard "*" is allowed) (optional)
 
-| weechat | bar_item | Auflistung der Bar-Items | Bar Item Pointer (optional) | Bar-Item Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | bar_item | Auflistung der Bar-Items | Bar Item Pointer (optional) | bar item name (wildcard "*" is allowed) (optional)
 
 | weechat | bar_window | Auflistung der Bar-Fenster | Bar-Fenster Pointer (optional) | -
 
-| weechat | buffer | Auflistung der Buffer | Buffer Pointer (optional) | Name des Buffers (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | buffer | Auflistung der Buffer | Buffer Pointer (optional) | buffer name (wildcard "*" is allowed) (optional)
 
 | weechat | buffer_lines | Zeilen des Buffers | Buffer Pointer | -
 
-| weechat | filter | Auflistung der Filter | - | Name des Filters (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | filter | Auflistung der Filter | - | filter name (wildcard "*" is allowed) (optional)
 
 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (optional) | -
 
-| weechat | hook | Auflistung der Hooks | Hook-Pointer (optional) | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
+| weechat | hook | Auflistung der Hooks | Hook-Pointer (optional) | type,arguments (type is command/timer/.., arguments to get only some hooks (wildcard "*" is allowed), both are optional)
 
 | weechat | hotlist | Liste der Buffer in Hotlist | - | -
 
@@ -56,11 +56,11 @@
 
 | weechat | nicklist | Nicks in Nickliste für einen Buffer | Buffer Pointer | nick_xxx oder group_xxx um nur den Nick/Group xxx abzufragen (optional)
 
-| weechat | option | Auflistung der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | option | Auflistung der Optionen | - | option name (wildcard "*" is allowed) (optional)
 
-| weechat | plugin | Auflistung der Erweiterungen | Pointer der Erweiterung (optional) | Name einer Erweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | plugin | Auflistung der Erweiterungen | Pointer der Erweiterung (optional) | plugin name (wildcard "*" is allowed) (optional)
 
-| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | Name des Proxy (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | proxy name (wildcard "*" is allowed) (optional)
 
 | weechat | url_options | Optionen für URL | - | -
 
diff --git a/doc/de/autogen/user/alias_commands.txt b/doc/de/autogen/user/alias_commands.txt
index 527e0903c..99052e8eb 100644
--- a/doc/de/autogen/user/alias_commands.txt
+++ b/doc/de/autogen/user/alias_commands.txt
@@ -4,31 +4,31 @@
 ----
 /alias  [-completion <completion>] <alias> [<command> [;<command>...]]
 
-completion: optionale Vervollständigung für einen Alias-Befehl (Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet)
-            Hinweis: Mit der Variablen "%%command" kann eine Vervollständigung eines vorhandenen Befehls durchgeführt werden
-     alias: Name des Alias (kann mit Joker "*" beginnen oder enden um Aliase aufzulisten)
-   command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden)
+completion: completion for alias (optional, by default completion is done with target command)
+            note: you can use %%command to use completion of an existing command
+     alias: name of alias (wildcard "*" is allowed)
+   command: command name with arguments (many commands can be separated by semicolons)
 
-Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt.
+Without argument, this command lists all defined alias.
 
-Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden Wert ersetzt werden:
-        $n: Argument 'n' (zwischen 1 und 9)
-       $-m: Argumente von 1 bis 'm'
-       $n-: Argumente von 'n' bis zum letzten Argument
-      $n-m: Argumente von 'n' bis 'm'
-        $*: alle Argumente
-        $~: letztes Argument
-      $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar)
-            Beispiel: $nick, $channel, $server, $plugin, $name
+Note: in command, special variables are replaced:
+        $n: argument 'n' (between 1 and 9)
+       $-m: arguments from 1 to 'm'
+       $n-: arguments from 'n' to last
+      $n-m: arguments from 'n' to 'm'
+        $*: all arguments
+        $~: last argument
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
+            examples: $nick, $channel, $server, $plugin, $name
 
-Um ein Alias zu löschen wird der Befehl "/unalias" genutzt.
+To remove an alias, use command /unalias.
 
-Beispiele:
-  Alias "/split" wird anlegt um damit ein Fenster horizontal zu teilen:
+Examples:
+  alias /split to split window horizontally:
     /alias split /window splith
-  Alias "/hallo" wird angelegt um in allen Channels, außer im #weechat Channel, den Text "Hallo" auszugeben:
-    /alias hallo /allchan -exclude=#weechat msg * Hallo
-  Alias "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen:
+  alias /hello to say "hello" on all channels but not on #weechat:
+    /alias hello /allchan -exclude=#weechat msg * hello
+  alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin:
     /alias -completion %%sajoin forcejoin /quote forcejoin
 ----
 
diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt
index 5d426ca19..3ca87933f 100644
--- a/doc/de/autogen/user/irc_commands.txt
+++ b/doc/de/autogen/user/irc_commands.txt
@@ -13,18 +13,18 @@ target: Servername
 ----
 /allchan  [-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]
 
- -current: führt einen Befehl aus der an alle Channels des aktuellen Servers gesendet wird
- -exclude: dient zum Ausschluss ausgewählter Channels ('*' wird zu Beginn oder am Ende des Channel-Namens akzeptiert, um mehrere Channels auszuschließen)
-  command: Befehl der ausgeführt werden soll
-arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
+ -current: execute command for channels of current server only
+ -exclude: exclude some channels (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-Beispiele:
-  führe den Befehl '/me Ich teste gerade etwas...' für alle Channels aus:
-    /allchan me Ich teste gerade etwas...
-  schicke 'Hallo Welt' an jeden Channel, ausgenommen an den #weechat Channel:
-    /allchan -exclude=#weechat msg * Hallo Welt
-  schicke 'Hallo Welt' an jeden Channel, ausgenommen an den #weechat Channel und Channels die mit #linux beginnen:
-    /allchan -exclude=#weechat,#linux* msg * Hallo Welt
+Examples:
+  execute '/me is testing' on all channels:
+    /allchan me is testing
+  say 'hello' everywhere but not on #weechat:
+    /allchan -exclude=#weechat msg * hello
+  say 'hello' everywhere but not on #weechat and channels beginning with #linux:
+    /allchan -exclude=#weechat,#linux* msg * hello
 ----
 
 [[command_irc_allpv]]
@@ -33,19 +33,19 @@ Beispiele:
 ----
 /allpv  [-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]
 
- -current: führt einen Befehl aus der für alle privaten Buffer, des aktuellen Servers, Anwendung findet
- -exclude: dient zum Ausschluss ausgewählter Nicks ('*' wird zu Beginn oder am Ende des Nicknamens akzeptiert, um mehrere Nicks auszuschließen)
-  command: Befehl der ausgeführt werden soll
-arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
+ -current: execute command for private buffers of current server only
+ -exclude: exclude some nicks (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-Beispiele:
-  führe den Befehl '/me Ich teste gerade etwas...' für alle privaten Buffer aus:
-    /allpv me Ich teste gerade etwas...
-  schicke 'Hallo' an alle, ausgenommen an Nick foo:
-    /allpv -exclude=foo msg * Hallo
-  schicke 'Hallo' an alle, ausgenommen für Nick foo und Nicks die mit bar beginnen:
-    /allpv -exclude=foo,bar* msg * Hallo
-  schließe alle privaten Buffer:
+Examples:
+  execute '/me is testing' on all private buffers:
+    /allpv me is testing
+  say 'hello' everywhere but not for nick foo:
+    /allpv -exclude=foo msg * hello
+  say 'hello' everywhere but not for nick foo and nicks beginning with bar:
+    /allpv -exclude=foo,bar* msg * hello
+  close all private buffers:
     /allpv close
 ----
 
@@ -55,16 +55,16 @@ Beispiele:
 ----
 /allserv  [-exclude=<server>[,<server>...]] <command> [<arguments>]
 
- -exclude: dient zum Ausschluss ausgewählter Server ('*' wird zu Beginn oder am Ende des Servernamens akzeptiert, um mehrere Server auszuschließen)
-  command: Befehl der ausgeführt werden soll
-arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
+ -exclude: exclude some servers (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-Beispiele:
-  ändere den Nick auf allen Servern:
+Examples:
+  change nick on all servers:
     /allserv nick newnick
-  setzt den Status, auf allen Servern,auf abwesend:
+  set away on all servers:
     /allserv away I'm away
-  führt ein whois mit meinem nick auf allen Servern aus:
+  do a whois on my nick on all servers:
     /allserv whois $nick
 ----
 
@@ -155,8 +155,8 @@ Beispiel:
 ----
 /dehalfop  <nick> [<nick>...]
 
-nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
-   *: entzieht allen Nicks im Channel den half-operator-Status, ausgenommen sich selber
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove channel half-operator status from everybody on channel except yourself
 ----
 
 [[command_irc_deop]]
@@ -166,8 +166,8 @@ nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
 /deop  <nick> [<nick>...]
        * -yes
 
-nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
-   *: entzieht allen Nicks im Channel den Operator-Status, ausgenommen sich selber
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove channel operator status from everybody on channel except yourself
 ----
 
 [[command_irc_devoice]]
@@ -177,8 +177,8 @@ nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
 /devoice  <nick> [<nick>...]
           * -yes
 
-nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
-   *: entzieht allen Nicks im Channel den voice-Status
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove voice from everybody on channel
 ----
 
 [[command_irc_die]]
@@ -209,8 +209,8 @@ reason: Begründung der Trennung
 /halfop  <nick> [<nick>...]
          * -yes
 
-nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
-   *: vergibt an alle Nicks im Channel den half-operator-Status
+nick: nick or mask (wildcard "*" is allowed)
+   *: give channel half-operator status to everybody on channel
 ----
 
 [[command_irc_ignore]]
@@ -498,8 +498,8 @@ Beispiele:
 /op  <nick> [<nick>...]
      * -yes
 
-nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
-   *: vergibt an alle Nicks im Channel den Operator-Status
+nick: nick or mask (wildcard "*" is allowed)
+   *: give channel operator status to everybody on channel
 ----
 
 [[command_irc_oper]]
@@ -838,8 +838,8 @@ server: Servername
 ----
 /voice  <nick> [<nick>...]
 
-nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
-   *: vergibt an alle Nicks im Channel den voice-Status
+nick: nick or mask (wildcard "*" is allowed)
+   *: give voice to everybody on channel
 ----
 
 [[command_irc_wallchops]]
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index 2f5364fa1..1166cd839 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -174,7 +174,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
 * [[option_irc.look.highlight_tags_restrict]] *irc.look.highlight_tags_restrict*
-** Beschreibung: `beschränkt Highlights für IRC Buffer auf bestimmte Tags (um Highlights durch User- aber nicht durch Servernachrichten zu erhalten); Tags müssen durch Kommata getrennt werden, um eine logische "und" Verknüpfung zu verwenden, können mehrere Tags durch "+" zusammengefügt werden; Tags können mit "*" beginnen oder enden um mehr als ein Tag zu markieren; wird kein Wert angegeben, erzeugt jedes Tag ein Highlight`
+** Beschreibung: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; wildcard "*" is allowed in tags; an empty value allows highlight on any tag`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"irc_privmsg,irc_notice"`)
 
diff --git a/doc/de/autogen/user/trigger_commands.txt b/doc/de/autogen/user/trigger_commands.txt
index f68f156ea..9e8cdc8aa 100644
--- a/doc/de/autogen/user/trigger_commands.txt
+++ b/doc/de/autogen/user/trigger_commands.txt
@@ -15,64 +15,64 @@
           default -yes
           monitor [<filter>]
 
-       list: zeigt eine Liste aller Trigger (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-   listfull: zeigt eine detaillierte Liste, mit zusätzlichen Informationen, aller Trigger an
-listdefault: zeigt die standardmäßig genutzen Trigger an
-        add: fügt einen Trigger hinzu
-     addoff: fügt einen Trigger hinzu (deaktiviert)
- addreplace: fügt oder ersetzt einen schon existierenden Trigger
-       name: Name des Trigger
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
        hook: signal, hsignal, modifier, print, command, command_run, timer, config, focus
-  arguments: Argumente für den Hook, abhängig vom genutzten Hook (getrennt durch Semikolon):
-             signal: Name(en) des signals (erforderlich)
-             hsignal: Name(en) des hsignal (erforderlich)
-             modifier: Name(en) des modifier (erforderlich)
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
              print: buffer, tags, message, strip colors
-             command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung
-             command_run: Befehl(e) (erforderlich)
-             timer: Intervall (erforderlich), Anpassung an Sekunden (erforderlich), maximale Anzahl an Aufrufen
-             config: Name der Option (erforderlich)
-             focus: Name(n) für sichtbaren Bereich (erforderlich) (z.B. "chat" für Chatbereich)
- conditions: evaluierte Bedingungen für den Trigger
-      regex: einer oder mehrere reguläre Ausdrücke um Zeichenketten in Variablen zu ersetzen
-    command: Befehl welcher ausgeführt werden soll (mehrere Befehle müssen durch ";" voneinander getrennt werden
-return_code: Rückgabewert für Callback (ok (standard), ok_eat, error)
-   addinput: erstellt einen Trigger mit einer standardmäßigen Mustervorlage
-      input: kopiert den kompletten Trigger-Befehl in die Eingabezeile
-     output: schickt den Trigger-Befehl als Text in den Buffer
-   recreate: wie "input", allerdings wird die Option "addreplace" anstelle von "add" genutzt
-        set: definiert, innerhalb eines Triggers, eine Option neu
-     option: Name einer Option: name, hook, arguments, conditions, regex, command, return_code
-             (um Hilfe über eine Option zu erhalten: /help trigger.trigger.<name>.<option>)
-      value: neuer Wert für Option
-     rename: benennt einen Trigger um
-       copy: kopiert einen Trigger
-     enable: aktiviert Trigger (ohne Angabe von Argumenten: aktiviert alle Trigger)
-    disable: deaktiviert Trigger (ohne Angabe von Argumenten: deaktiviert alle Trigger)
-     toggle: de-/aktiviert Trigger (ohne Angabe von Argumenten: de-/aktiviert alle Trigger)
-    restart: startet Trigger neu (Hook(s) werden neu erstellt)
-       show: zeigt detaillierte Informationen zu einem Trigger (inklusive einer kleinen Statistik)
-        del: entfernt einen Trigger
-       -all: führt eine Aktion aus, die alle Trigger beinhaltet
-    default: stellt die standardmäßigen Trigger wieder her
-    monitor: öffnet den Trigger Monitor-Buffer, mit optionaler Filterfunktion:
-     Filter: zeigt Hooks/Trigger an (ein Hook muss mit "@" beginnen, zum Beispiel "@signal"), mehrere Filter können durch Kommata voneinander getrennt werden; der Name eines Trigger kann mit "*" beginnen oder enden
+             command: command (required), description, arguments, description of arguments, completion
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";"
+return_code: return code in callback (ok (default), ok_eat, error)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    default: restore default triggers
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-Wenn ein Trigger-Callback aufgerufen wird, dann wird folgende Befehlskette ausgeführt:
-  1. Überprüfung von Bedingungen; falls unwahr, beenden
-  2. ersetze Text mittels erweitertem regulärer POSIX Ausdruck (sofern im Trigger definiert)
-  3. ein oder mehrere Befehle werden ausgeführt (sofern im Trigger definiert)
-  4. Beendigung mit einem Rückgabewert (ausgenommen sind modifiers und focus)
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifiers and focus)
 
-Beispiele (die standardmäßig, eingebauten Trigger kann man sich mit "/trigger listdefault" anzeigen lassen):
-  fügt einer Nachricht die Textattribute *fett*, _unterstrichen_ und /kursiv/ hinzu:
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*(\S+)\*==*${color:bold}$1${color:-bold}*== ==_(\S+)_==_${color:underline}$1${color:-underline}_== ==/(\S+)/==/${color:italic}$1${color:-italic}/"
-  verbirgt die Nicklist auf kleineren Terminals:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  speichert die Konfiguration jede Stunde ab:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  öffnet den Trigger Monitor und zeigt ausschließlich modifier und Trigger an, die mit "resize" im Namen beginnen:
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index 74974be7f..9d91ef671 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -314,10 +314,10 @@ disable: disable filters
          - 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
+         - wildcard "*" is allowed
    tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
          - logical "and": use "+" between tags (for example: "nick_toto+irc_action")
-         - tags can start or end with '*'
+         - wildcard "*" is allowed
   regex: POSIX extended 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 '!')
@@ -451,44 +451,44 @@ Dieser Befehl wird sinnvollerweise mittels Tastenbelegungen oder Erweiterungen g
       resetall -yes [<context>]
       missing [<context>]
 
-       list: zeigt die aktuelle Tastenbelegungen an (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-listdefault: zeigt die Standardeinstellung der Tastenbelegung an
-   listdiff: zeigt die Unterschiede zwischen der aktuell genutzten Tastaturbelegung und der Standardbelegung an (hinzugefügte/verändert/gelöschte Tastenbelegungen)
-    context: Name des Kontextes ("default" oder "search")
-       bind: belegt eine Taste mit einem Befehl oder zeigt an welcher Befehl auf eine Taste gelegt wurde (für Kontext  "default")
-   bindctxt: belegt eine Taste mit einem Befehl oder zeigt an welcher Befehl auf eine Taste gelegt wurde, dies trifft für Kontext definierte Tasten zu
-    command: Befehl (mehrere Befehle werden durch ein Semikolon getrennt)
-     unbind: hebt eine Tastenbelegung auf (für Kontext "default")
- unbindctxt: hebt eine Tastenbelegung für den angegebenen Kontext auf
-      reset: die Tastenbelegung wird für die ausgewählte Taste auf die Standardeinstellung zurück gesetzt (für Kontext "default")
-  resetctxt: die Tastenbelegung wird für die ausgewählte Taste auf die Standardeinstellung zurück gesetzt, dies trifft für den ausgewählten Kontext zu
-   resetall: die Tastenbelegung wird auf die Standardeinstellungen zurück gesetzt. Dies löscht ALLE persönlichen Tastenbelegungen (Vorsicht!)
-    missing: fügt fehlende Tastenbelegungen hinzu (dazu wird die Standardbelegung genutzt). Dies kann sinnvoll sein wenn man auf eine neue WeeChat Version umgestiegen ist
+       list: list all current keys (without argument, this list is displayed)
+listdefault: list default keys
+   listdiff: list differences between current and default keys (keys added, redefined or deleted)
+    context: name of context ("default" or "search")
+       bind: bind a command to a key or display command bound to key (for context "default")
+   bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
+     unbind: remove a key binding (for context "default")
+ unbindctxt: remove a key binding for given context
+      reset: reset a key to default binding (for context "default")
+  resetctxt: reset a key to default binding, for given context
+   resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+    missing: add missing keys (using default bindings), useful after installing new WeeChat version
 
-Falls einer Taste ein Befehl zugeordnet werden soll ist es ratsam zuerst mit der Tastenkombination alt+k (oder Esc + k) einen Fangmodus zu aktivieren um damit die neu zu belegende Taste zu greifen. Durch diesen Schritt wird der entsprechende Tasten-Code in die Befehlszeile übernommen.
+When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key code in command line.
 
-Für Kontext "mouse" (Kontext "cursor" ist auch möglich), hat der zu verwendende Schlüssel folgendes Format: "@area:Schlüssel" oder "@area1>area2:Schlüssel". "area" kann folgende Werte habe:
-          *: jedweder Bereich des Bildschirms
-       chat: Chatbereich (für jeden Buffer)
-  chat(xxx): Chatbereich für einen Buffer mit dem Namen "xxx" (vollständiger Name mit Erweiterung. Beispiel: chat(perl.iset):)
-     bar(*): beliebige Bar
-   bar(xxx): Bar mit dem Namen "xxx"
-    item(*): beliebiges Bar-Item
-  item(xxx): Bar-Item mit Namen "xxx"
-Der zu nutzende Schlüssel kann mit '*' beginnen oder enden um mehrere unterschiedliche Mausereignisse auszuwählen.
-Für den Kontext "mouse" kann ein besonderer Übergabewert für den zu nutzenden Befehl verwendet werden, "hsignal:name".  Dieses sendet das hsignal "name" und als Inhalt ein Hashtable als Argument.
-Ein weiterer Übergabewert ist "-" und kann genutzt werden um einen Schlüssel zu deaktivieren (der Schlüssel wird bei der Durchführung übersprungen).
+For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be:
+          *: any area on screen
+       chat: chat area (any buffer)
+  chat(xxx): char area for buffer with name "xxx" (full name including plugin)
+     bar(*): any bar
+   bar(xxx): bar "xxx"
+    item(*): any bar item
+  item(xxx): bar item "xxx"
+Wildcard "*" is allowed in key to match many mouse events.
+A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
+Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
-Beispiele:
-  Mit der Tastenkombination "alt-x" wird die Nicklist-Bar an-und aus geschaltet:
+Examples:
+  key alt-x to toggle nicklist bar:
     /key bind meta-x /bar toggle nicklist
-  Mit der Tastenkombination "alt-r" wird direkt zum IRC #weechat Buffer gewechselt:
+  key alt-r to jump to #weechat IRC channel:
     /key bind meta-r /buffer #weechat
-  Die Tastenkombination "alt-r" wird auf die Standardfunktion zurückgesetzt:
+  restore default binding for key alt-r:
     /key reset meta-r
-  "Tab"-Taste nutzen um im Kontext "search" die Suche innerhalb eines Buffers zu beenden:
+  key "tab" to stop search in buffer:
     /key bindctxt search ctrl-I /input search_stop
-  Auswahl eines Nicknamens mittels mittlerer Maustaste zeigt zusätzliche Informationen zu dem Nick an:
+  middle button of mouse on a nick to retrieve info on nick:
     /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick}
 ----
 
@@ -758,26 +758,26 @@ Beispiele:
 /set  [<option> [<value>]]
       diff [<option> [<option>...]]
 
-option: Name der zu ändernden Option (um mehrere Optionen anzuzeigen, darf der Name mit einem Joker '*' beginnen oder enden)
- value: neuer Wert, den die Option erhalten soll
-  diff: es werden nur Optionen angezeigt, die geändert wurden
+option: name of an option (wildcard "*" is allowed)
+ value: new value for option
+  diff: display only changed options
 
-Abhängig von der ausgewählten Option, kann die Variable folgenden Inhalt haben:
-  boolean: on, off oder toggle
-  integer: Anzahl, ++Anzahl oder --Anzahl
-  string : jede Zeichenkette ("" für eine leere Zeichenkette)
-  color  : Name einer Farbe, ++Anzahl oder --Anzahl
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-Für alle Typen von Variablen kann die Zeichenkette "null" (ohne "")  genutzt werden, um den Wert der Option zu löschen (undefinierter Wert). Dies kann nur auf einige besondere Variablen (Erweiterungen) angewendet werden.
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-Beispiele:
-  Zeigt alle Optionen an, die etwas mit highlight zu tun haben:
+Examples:
+  display options about highlight:
     /set *highlight*
-  Fügt ein highlight-Wort hinzu:
+  add a word to highlight:
     /set weechat.look.highlight "word"
-  zeigt geänderte Optionen an:
+  display changed options:
     /set diff
-  zeigt geänderte Optionen, der IRC Erweiterung, an:
+  display changed options in irc plugin:
     /set diff irc.*
 ----
 
@@ -787,14 +787,14 @@ Beispiele:
 ----
 /unset  <option>
 
-option: Name einer Option (darf mit Joker "*" beginnen oder enden um mehrere Optionen zurückzusetzen. Nutzen Sie diese Funktion mit äußerster Sorgfalt!)
+option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
 
-Gemäß der jeweiligen Option wird diese zurückgesetzt (bei Standard-Optionen) oder komplett entfernt (bei optionalen Einstellungen, zum Beispiel die Server-Einstellungen).
+According to option, it's reset (for standard options) or removed (for optional settings, like server values).
 
-Beispiele:
-  Eine Option zurücksetzen:
+Examples:
+  reset one option:
     /unset weechat.look.item_time_format
-  Alle Farboptionen zurücksetzen:
+  reset all color options:
     /unset weechat.color.*
 ----
 
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 644b97bd2..37233bf81 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -554,7 +554,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** Beschreibung: `eine durch Kommata getrennte Liste von Tags, die eine highlight-Nachricht erzeugen; Groß- und Kleinschreibung wird dabei nicht beachtet; Tags können mit "*" beginnen oder enden um mehr als ein Tag zu markieren. Um eine logische "und" Verknüpfung zu verwenden, können mehrere Tags durch "+" zusammengefügt werden. Beispiele: "nick_flashcode" für Nachrichten von "FlashCode", "irc_notice+nick_toto*" für Notice-Nachrichten von Nicks, die mit "toto" beginnen`
+** Beschreibung: `comma separated list of tags to highlight; case insensitive comparison; wildcard "*" is allowed in each 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: `""`)
 
@@ -899,7 +899,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** Beschreibung: `durch Kommata getrennte Liste der Erweiterungen, die beim Programmstart automatisch geladen werden sollen; "*" lädt alle vorhandenen Erweiterungen. Beginnt der Name hingegen mit "!" wird die Erweiterung nicht geladen. Suchmuster können mit einem Joker ("*") beginnen oder enden um mehrere Erweiterungen zu laden (Beispiele: "*" oder "*,!lua,!tcl")`
+** Beschreibung: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, wildcard "*" is allowed in names (examples: "*" or "*,!lua,!tcl")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"*"`)
 
diff --git a/doc/en/autogen/plugin_api/infolists.txt b/doc/en/autogen/plugin_api/infolists.txt
index 9c6eb98bc..b624a9018 100644
--- a/doc/en/autogen/plugin_api/infolists.txt
+++ b/doc/en/autogen/plugin_api/infolists.txt
@@ -2,9 +2,9 @@
 |===
 | Plugin | Name | Description | Pointer | Arguments
 
-| alias | alias | list of aliases | alias pointer (optional) | alias name (can start or end with "*" as wildcard) (optional)
+| alias | alias | list of aliases | alias pointer (optional) | alias name (wildcard "*" is allowed) (optional)
 
-| guile | guile_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
+| guile | guile_script | list of scripts | script pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
 | irc | irc_channel | list of channels for an IRC server | channel pointer (optional) | server,channel (channel is optional)
 
@@ -12,41 +12,41 @@
 
 | irc | irc_nick | list of nicks for an IRC channel | nick pointer (optional) | server,channel,nick (channel and nick are optional)
 
-| irc | irc_notify | list of notify | notify pointer (optional) | server name (can start or end with "*" as wildcard) (optional)
+| irc | irc_notify | list of notify | notify pointer (optional) | server name (wildcard "*" is allowed) (optional)
 
-| irc | irc_server | list of IRC servers | server pointer (optional) | server name (can start or end with "*" as wildcard) (optional)
+| irc | irc_server | list of IRC servers | server pointer (optional) | server name (wildcard "*" is allowed) (optional)
 
 | logger | logger_buffer | list of logger buffers | logger pointer (optional) | -
 
-| lua | lua_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
+| lua | lua_script | list of scripts | script pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| perl | perl_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
+| perl | perl_script | list of scripts | script pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| python | python_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
+| python | python_script | list of scripts | script pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
 | relay | relay | list of relay clients | relay pointer (optional) | -
 
-| ruby | ruby_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
+| ruby | ruby_script | list of scripts | script pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| script | script_script | list of scripts | script pointer (optional) | script name with extension (can start or end with "*" as wildcard) (optional)
+| script | script_script | list of scripts | script pointer (optional) | script name with extension (wildcard "*" is allowed) (optional)
 
-| tcl | tcl_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
+| tcl | tcl_script | list of scripts | script pointer (optional) | script name (wildcard "*" is allowed) (optional)
 
-| weechat | bar | list of bars | bar pointer (optional) | bar name (can start or end with "*" as wildcard) (optional)
+| weechat | bar | list of bars | bar pointer (optional) | bar name (wildcard "*" is allowed) (optional)
 
-| weechat | bar_item | list of bar items | bar item pointer (optional) | bar item name (can start or end with "*" as wildcard) (optional)
+| weechat | bar_item | list of bar items | bar item pointer (optional) | bar item name (wildcard "*" is allowed) (optional)
 
 | weechat | bar_window | list of bar windows | bar window pointer (optional) | -
 
-| weechat | buffer | list of buffers | buffer pointer (optional) | buffer name (can start or end with "*" as wildcard) (optional)
+| weechat | buffer | list of buffers | buffer pointer (optional) | buffer name (wildcard "*" is allowed) (optional)
 
 | weechat | buffer_lines | lines of a buffer | buffer pointer | -
 
-| weechat | filter | list of filters | - | filter name (can start or end with "*" as wildcard) (optional)
+| weechat | filter | list of filters | - | filter name (wildcard "*" is allowed) (optional)
 
 | weechat | history | history of commands | buffer pointer (if not set, return global history) (optional) | -
 
-| weechat | hook | list of hooks | hook pointer (optional) | type,arguments (type is command/timer/.., arguments to get only some hooks (can start or end with "*" as wildcard), both are optional)
+| weechat | hook | list of hooks | hook pointer (optional) | type,arguments (type is command/timer/.., arguments to get only some hooks (wildcard "*" is allowed), both are optional)
 
 | weechat | hotlist | list of buffers in hotlist | - | -
 
@@ -56,11 +56,11 @@
 
 | weechat | nicklist | nicks in nicklist for a buffer | buffer pointer | nick_xxx or group_xxx to get only nick/group xxx (optional)
 
-| weechat | option | list of options | - | option name (can start or end with "*" as wildcard) (optional)
+| weechat | option | list of options | - | option name (wildcard "*" is allowed) (optional)
 
-| weechat | plugin | list of plugins | plugin pointer (optional) | plugin name (can start or end with "*" as wildcard) (optional)
+| weechat | plugin | list of plugins | plugin pointer (optional) | plugin name (wildcard "*" is allowed) (optional)
 
-| weechat | proxy | list of proxies | proxy pointer (optional) | proxy name (can start or end with "*" as wildcard) (optional)
+| weechat | proxy | list of proxies | proxy pointer (optional) | proxy name (wildcard "*" is allowed) (optional)
 
 | weechat | url_options | options for URL | - | -
 
diff --git a/doc/en/autogen/user/alias_commands.txt b/doc/en/autogen/user/alias_commands.txt
index 669879e7b..1d56aec1a 100644
--- a/doc/en/autogen/user/alias_commands.txt
+++ b/doc/en/autogen/user/alias_commands.txt
@@ -6,7 +6,7 @@
 
 completion: completion for alias (optional, by default completion is done with target command)
             note: you can use %%command to use completion of an existing command
-     alias: name of alias (can start or end with "*" for alias listing)
+     alias: name of alias (wildcard "*" is allowed)
    command: command name with arguments (many commands can be separated by semicolons)
 
 Without argument, this command lists all defined alias.
diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt
index 34e111bbe..08b0c2286 100644
--- a/doc/en/autogen/user/irc_commands.txt
+++ b/doc/en/autogen/user/irc_commands.txt
@@ -14,7 +14,7 @@ target: server name
 /allchan  [-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]
 
  -current: execute command for channels of current server only
- -exclude: exclude some channels ('*' is allowed at beginning or end of channel name, to exclude many channels)
+ -exclude: exclude some channels (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -34,7 +34,7 @@ Examples:
 /allpv  [-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]
 
  -current: execute command for private buffers of current server only
- -exclude: exclude some nicks ('*' is allowed at beginning or end of nick name, to exclude many nicks)
+ -exclude: exclude some nicks (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -55,7 +55,7 @@ Examples:
 ----
 /allserv  [-exclude=<server>[,<server>...]] <command> [<arguments>]
 
- -exclude: exclude some servers ('*' is allowed at beginning or end of server name, to exclude many servers)
+ -exclude: exclude some servers (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -155,7 +155,7 @@ Examples:
 ----
 /dehalfop  <nick> [<nick>...]
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: remove channel half-operator status from everybody on channel except yourself
 ----
 
@@ -166,7 +166,7 @@ nick: nick or mask (can start or end with "*" as wildcard)
 /deop  <nick> [<nick>...]
        * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: remove channel operator status from everybody on channel except yourself
 ----
 
@@ -177,7 +177,7 @@ nick: nick or mask (can start or end with "*" as wildcard)
 /devoice  <nick> [<nick>...]
           * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: remove voice from everybody on channel
 ----
 
@@ -209,7 +209,7 @@ target: server name
 /halfop  <nick> [<nick>...]
          * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: give channel half-operator status to everybody on channel
 ----
 
@@ -498,7 +498,7 @@ Examples:
 /op  <nick> [<nick>...]
      * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: give channel operator status to everybody on channel
 ----
 
@@ -838,7 +838,7 @@ server: server name
 ----
 /voice  <nick> [<nick>...]
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: give voice to everybody on channel
 ----
 
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 03bd02074..c88335cac 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -174,7 +174,7 @@
 ** values: any string (default value: `"$nick"`)
 
 * [[option_irc.look.highlight_tags_restrict]] *irc.look.highlight_tags_restrict*
-** description: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; tags can start or end with "*" to match more than one tag; an empty value allows highlight on any tag`
+** description: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; wildcard "*" is allowed in tags; an empty value allows highlight on any tag`
 ** type: string
 ** values: any string (default value: `"irc_privmsg,irc_notice"`)
 
diff --git a/doc/en/autogen/user/trigger_commands.txt b/doc/en/autogen/user/trigger_commands.txt
index 553056b7b..5f3c36ac2 100644
--- a/doc/en/autogen/user/trigger_commands.txt
+++ b/doc/en/autogen/user/trigger_commands.txt
@@ -56,7 +56,7 @@ return_code: return code in callback (ok (default), ok_eat, error)
        -all: do action on all triggers
     default: restore default triggers
     monitor: open the trigger monitor buffer, with optional filter:
-     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; each trigger name can start or end with "*"
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
 When a trigger callback is called, following actions are performed, in this order:
   1. check conditions; if false, exit
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index c5b25e462..fb37f922a 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -314,10 +314,10 @@ disable: disable filters
          - 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
+         - wildcard "*" is allowed
    tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
          - logical "and": use "+" between tags (for example: "nick_toto+irc_action")
-         - tags can start or end with '*'
+         - wildcard "*" is allowed
   regex: POSIX extended 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 '!')
@@ -475,7 +475,7 @@ For context "mouse" (possible in context "cursor" too), key has format: "@area:k
    bar(xxx): bar "xxx"
     item(*): any bar item
   item(xxx): bar item "xxx"
-The key can start or end with '*' to match many mouse events.
+Wildcard "*" is allowed in key to match many mouse events.
 A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
 Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
@@ -758,7 +758,7 @@ Examples:
 /set  [<option> [<value>]]
       diff [<option> [<option>...]]
 
-option: name of an option (can start or end with '*' to list many options)
+option: name of an option (wildcard "*" is allowed)
  value: new value for option
   diff: display only changed options
 
@@ -787,7 +787,7 @@ Examples:
 ----
 /unset  <option>
 
-option: name of an option (may begin or end with "*" to mass-reset options, use carefully!)
+option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
 
 According to option, it's reset (for standard options) or removed (for optional settings, like server values).
 
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 18552e876..1ffead404 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -554,7 +554,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; 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"`
+** description: `comma separated list of tags to highlight; case insensitive comparison; wildcard "*" is allowed in each 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: `""`)
 
@@ -899,7 +899,7 @@
 ** values: any string (default value: `""`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** description: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, names can start or end with "*" to match several plugins (examples: "*" or "*,!lua,!tcl")`
+** description: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, wildcard "*" is allowed in names (examples: "*" or "*,!lua,!tcl")`
 ** 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 21f813f51..42c6dfc5a 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -809,6 +809,8 @@ length = weechat.strlen_screen("é") # 1
 
 ==== weechat_string_match
 
+_Updated in 0.4.4._
+
 Check if a string matches a mask.
 
 Prototype:
@@ -822,10 +824,14 @@ int weechat_string_match (const char *string, const char *mask,
 Arguments:
 
 * 'string': string
-* 'mask': mask, can begin or end with "`*`" (no other "`*`" are allowed inside
-  mask)
+* 'mask': mask with wildcards ("*"), each wildcard matches 0 or more chars in
+  the string
 * 'case_sensitive': 1 for case sensitive comparison, otherwise 0
 
+[NOTE]
+Since version 0.4.4, wildcards are allowed inside the mask
+(not only beginning/end of mask).
+
 Return value:
 
 * 1 if string matches mask, otherwise 0
@@ -834,10 +840,11 @@ C example:
 
 [source,C]
 ----
-int match1 = weechat_string_match ("abcdef", "abc*", 0); /* == 1 */
-int match2 = weechat_string_match ("abcdef", "*dd*", 0); /* == 0 */
-int match3 = weechat_string_match ("abcdef", "*def", 0); /* == 1 */
-int match4 = weechat_string_match ("abcdef", "*de*", 0); /* == 1 */
+int match1 = weechat_string_match ("abcdef", "abc*", 0);  /* == 1 */
+int match2 = weechat_string_match ("abcdef", "*dd*", 0);  /* == 0 */
+int match3 = weechat_string_match ("abcdef", "*def", 0);  /* == 1 */
+int match4 = weechat_string_match ("abcdef", "*de*", 0);  /* == 1 */
+int match5 = weechat_string_match ("abcdef", "*b*d*", 0); /* == 1 */
 ----
 
 Script (Python):
@@ -848,10 +855,11 @@ Script (Python):
 match = weechat.string_match(string, mask, case_sensitive)
 
 # examples
-match1 = weechat.string_match("abcdef", "abc*", 0) # 1
-match2 = weechat.string_match("abcdef", "*dd*", 0) # 0
-match3 = weechat.string_match("abcdef", "*def", 0) # 1
-match4 = weechat.string_match("abcdef", "*de*", 0) # 1
+match1 = weechat.string_match("abcdef", "abc*", 0)  # 1
+match2 = weechat.string_match("abcdef", "*dd*", 0)  # 0
+match3 = weechat.string_match("abcdef", "*def", 0)  # 1
+match4 = weechat.string_match("abcdef", "*de*", 0)  # 1
+match5 = weechat.string_match("abcdef", "*b*d*", 0) # 1
 ----
 
 ==== weechat_string_expand_home
@@ -6838,7 +6846,7 @@ struct t_hook *weechat_hook_command_run (const char *command,
 
 Arguments:
 
-* 'command': command to hook, can start or end with "*" as wildcard
+* 'command': command to hook (wildcard "*" is allowed)
   (priority allowed, see note about <<hook_priority,priority>>)
 * 'callback': function called when command is run, arguments and return value:
 ** 'void *data': pointer
@@ -7571,7 +7579,7 @@ Arguments:
 * 'tags': catch only messages with these tags (optional):
 ** with WeeChat ≥ 0.4.3: comma-separated list of tags that must be in message
    (logical "or"); it is possible to combine many tags as a logical "and" with
-   separator "+"; each tag can start or end with "*" to match many tags
+   separator "+"; wildcard "*" is allowed in tags
 ** with WeeChat ≤ 0.4.2: comma-separated list of tags that must all be in
    message (logical "and")
 * 'message': only messages with this string will be caught (optional, case
@@ -7651,7 +7659,7 @@ struct t_hook *weechat_hook_signal (const char *signal,
 
 Arguments:
 
-* 'signal': signal to catch, can begin or end with "*"
+* 'signal': signal to catch, wildcard "*" is allowed
   (priority allowed, see note about <<hook_priority,priority>>)
   (see table below)
 * 'callback': function called when signal is received, arguments and return
@@ -8507,7 +8515,7 @@ struct t_hook *weechat_hook_hsignal (const char *signal,
 
 Arguments:
 
-* 'signal': signal to catch, can begin or end with "*"
+* 'signal': signal to catch, wildcard "*" is allowed
   (priority allowed, see note about <<hook_priority,priority>>)
   (see table below)
 * 'callback': function called when signal is received, arguments and return
@@ -8863,7 +8871,7 @@ struct t_hook *weechat_hook_config (const char *option,
 Arguments:
 
 * 'option': option, format is full name, as used with command `/set` (for
-  example: `weechat.look.item_time_format`)
+  example: `weechat.look.item_time_format`), wildcard "*" is allowed
   (priority allowed, see note about <<hook_priority,priority>>)
 * 'callback': function called when configuration option is changed, arguments
   and return value:
@@ -10772,7 +10780,7 @@ Arguments:
 * 'string': comma-separated list of buffers:
 ** "*" means all buffers
 ** name beginning with "!" is excluded
-** name can start or end with "*" to match many buffers
+** wildcard "*" is allowed in name
 
 Return value:
 
diff --git a/doc/fr/autogen/plugin_api/infolists.txt b/doc/fr/autogen/plugin_api/infolists.txt
index 705dbeb46..c30ff68c7 100644
--- a/doc/fr/autogen/plugin_api/infolists.txt
+++ b/doc/fr/autogen/plugin_api/infolists.txt
@@ -2,9 +2,9 @@
 |===
 | Extension | Nom | Description | Pointeur | Paramètres
 
-| alias | alias | liste des alias | pointeur vers l'alias (optionnel) | nom d'alias (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| alias | alias | liste des alias | pointeur vers l'alias (optionnel) | nom d'alias (le caractère joker "*" est autorisé) (optionnel)
 
-| guile | guile_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| guile | guile_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (le caractère joker "*" est autorisé) (optionnel)
 
 | irc | irc_channel | liste des canaux pour un serveur IRC | pointeur vers le canal (optionnel) | serveur,canal (le canal est optionnel)
 
@@ -12,41 +12,41 @@
 
 | irc | irc_nick | liste des pseudos pour un canal IRC | pointeur vers le pseudo (optionnel) | serveur,canal,pseudo (canal et pseudo sont optionnels)
 
-| irc | irc_notify | liste des notifications | pointeur vers la notification (optionnel) | nom de serveur (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| irc | irc_notify | liste des notifications | pointeur vers la notification (optionnel) | nom de serveur (le caractère joker "*" est autorisé) (optionnel)
 
-| irc | irc_server | liste des serveurs IRC | pointeur vers le serveur (optionnel) | nom de serveur (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| irc | irc_server | liste des serveurs IRC | pointeur vers le serveur (optionnel) | nom de serveur (le caractère joker "*" est autorisé) (optionnel)
 
 | logger | logger_buffer | liste des enregistreurs de tampons (loggers) | pointeur vers le logger (optionnel) | -
 
-| lua | lua_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| lua | lua_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (le caractère joker "*" est autorisé) (optionnel)
 
-| perl | perl_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| perl | perl_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (le caractère joker "*" est autorisé) (optionnel)
 
-| python | python_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| python | python_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (le caractère joker "*" est autorisé) (optionnel)
 
 | relay | relay | liste des clients pour le relai | pointeur vers le relay (optionnel) | -
 
-| ruby | ruby_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| ruby | ruby_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (le caractère joker "*" est autorisé) (optionnel)
 
-| script | script_script | liste des scripts | pointeur vers le script (optionnel) | nom du script avec extension (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| script | script_script | liste des scripts | pointeur vers le script (optionnel) | nom du script avec extension (le caractère joker "*" est autorisé) (optionnel)
 
-| tcl | tcl_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| tcl | tcl_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (le caractère joker "*" est autorisé) (optionnel)
 
-| weechat | bar | liste des barres | pointeur vers la barre (optionnel) | nom de barre (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | bar | liste des barres | pointeur vers la barre (optionnel) | nom de barre (le caractère joker "*" est autorisé) (optionnel)
 
-| weechat | bar_item | liste des objets de barres | pointeur vers l'objet de barre (optionnel) | nom d'objet de barre (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | bar_item | liste des objets de barres | pointeur vers l'objet de barre (optionnel) | nom d'objet de barre (le caractère joker "*" est autorisé) (optionnel)
 
 | weechat | bar_window | liste des fenêtres de barre | pointeur vers la fenêtre de barre (optionnel) | -
 
-| weechat | buffer | liste des tampons | pointeur vers le tampon (optionnel) | nom de tampon (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | buffer | liste des tampons | pointeur vers le tampon (optionnel) | nom de tampon (le caractère joker "*" est autorisé) (optionnel)
 
 | weechat | buffer_lines | lignes d'un tampon | pointeur vers le tampon | -
 
-| weechat | filter | liste des filtres | - | nom de filtre (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | filter | liste des filtres | - | nom de filtre (le caractère joker "*" est autorisé) (optionnel)
 
 | weechat | history | historique des commandes | pointeur vers le tampon (si non défini, retourne l'historique global) (optionnel) | -
 
-| weechat | hook | liste des hooks | pointeur vers le hook (optionnel) | type,paramètres (le type est command/timer/.., paramètres pour avoir seulement quelques hooks (peut démarrer ou se terminer par "*" comme joker), les deux sont optionnels)
+| weechat | hook | liste des hooks | pointeur vers le hook (optionnel) | type,paramètres (le type est command/timer/.., paramètres pour avoir seulement quelques hooks (le caractère joker "*" est autorisé), les deux sont optionnels)
 
 | weechat | hotlist | liste des tampons dans la hotlist | - | -
 
@@ -56,11 +56,11 @@
 
 | weechat | nicklist | pseudos dans la liste des pseudos pour un tampon | pointeur vers le tampon | nick_xxx ou group_xxx pour avoir seulement le pseudo/groupe xxx (optionnel)
 
-| weechat | option | liste des options | - | nom d'option (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | option | liste des options | - | nom d'option (le caractère joker "*" est autorisé) (optionnel)
 
-| weechat | plugin | liste des extensions | pointeur vers l'extension (optionnel) | nom d'extension (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | plugin | liste des extensions | pointeur vers l'extension (optionnel) | nom d'extension (le caractère joker "*" est autorisé) (optionnel)
 
-| weechat | proxy | liste des proxies | pointeur vers le proxy (optionnel) | nom de proxy (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+| weechat | proxy | liste des proxies | pointeur vers le proxy (optionnel) | nom de proxy (le caractère joker "*" est autorisé) (optionnel)
 
 | weechat | url_options | options pour l'URL | - | -
 
diff --git a/doc/fr/autogen/user/alias_commands.txt b/doc/fr/autogen/user/alias_commands.txt
index c61e01240..14233425c 100644
--- a/doc/fr/autogen/user/alias_commands.txt
+++ b/doc/fr/autogen/user/alias_commands.txt
@@ -6,7 +6,7 @@
 
 complétion: complétion pour l'alias (optionnel, par défaut la complétion se fait avec la commande cible)
             note: vous pouvez utiliser %%commande pour utiliser la complétion d'une commande existante
-     alias: nom de l'alias (peut démarrer ou se terminer par "*" pour une liste d'alias)
+     alias: nom de l'alias (le caractère joker "*" est autorisé)
   commande: nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des points-virgules)
 
 Sans paramètre, cette commande liste tous les alias définis.
diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt
index 97bd4dd26..bfd190448 100644
--- a/doc/fr/autogen/user/irc_commands.txt
+++ b/doc/fr/autogen/user/irc_commands.txt
@@ -14,7 +14,7 @@ cible: nom du serveur
 /allchan  [-current] [-exclude=<canal>[,<canal>...]] <commande> [<paramètres>]
 
   -current: exécuter la commande pour les canaux du serveur courant seulement
-  -exclude: exclure certains canaux ('*' est autorisé au début ou à la fin du nom du canal, pour exclure plusieurs canaux)
+  -exclude: exclure certains canaux (le caractère joker "*" est autorisé)
   commande: commande à exécuter
 paramètres: paramètres pour la commande (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)
 
@@ -34,7 +34,7 @@ Exemples:
 /allpv  [-current] [-exclude=<pseudo>[,<pseudo>...]] <commande> [<paramètres>]
 
   -current: exécuter la commande pour les tampons privés du serveur courant seulement
-  -exclude: exclure certains pseudos ('*' est autorisé au début ou à la fin du pseudo, pour exclure plusieurs pseudos)
+  -exclude: exclure certains pseudos (le caractère joker "*" est autorisé)
   commande: commande à exécuter
 paramètres: paramètres pour la commande (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)
 
@@ -55,7 +55,7 @@ Exemples:
 ----
 /allserv  [-exclude=<serveur>[,<serveur>...]] <commande> [<paramètres>]
 
-  -exclude: exclude certains serveurs ('*' est autorisé en début ou fin du nom du serveur, pour exclure plusieurs serveurs)
+  -exclude: exclude certains serveurs (le caractère joker "*" est autorisé)
   commande: commande à exécuter
 paramètres: paramètres pour la commande (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)
 
@@ -155,7 +155,7 @@ Exemples:
 ----
 /dehalfop  <pseudo> [<pseudo>...]
 
-pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
+pseudo: pseudo ou masque (le caractère joker "*" est autorisé)
      *: retirer le statut de demi-opérateur de tout le monde sur le canal excepté vous-même
 ----
 
@@ -166,7 +166,7 @@ pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
 /deop  <pseudo> [<pseudo>...]
        * -yes
 
-pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
+pseudo: pseudo ou masque (le caractère joker "*" est autorisé)
      *: retirer le statut d'opérateur de tout le monde sur le canal excepté vous-même
 ----
 
@@ -177,7 +177,7 @@ pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
 /devoice  <pseudo> [<pseudo>...]
           * -yes
 
-pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
+pseudo: pseudo ou masque (le caractère joker "*" est autorisé)
      *: retirer la voix de tout le monde sur le canal
 ----
 
@@ -209,7 +209,7 @@ cible: nom du serveur
 /halfop  <pseudo> [<pseudo>...]
          * -yes
 
-pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
+pseudo: pseudo ou masque (le caractère joker "*" est autorisé)
      *: donner le statut de demi-opérateur à tout le monde sur le canal
 ----
 
@@ -498,7 +498,7 @@ Exemples:
 /op  <pseudo> [<pseudo>...]
      * -yes
 
-pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
+pseudo: pseudo ou masque (le caractère joker "*" est autorisé)
      *: donner le statut d'opérateur à tout le monde sur le canal
 ----
 
@@ -838,7 +838,7 @@ serveur: nom du serveur
 ----
 /voice  <pseudo> [<pseudo>...]
 
-pseudo: pseudo ou masque (peut démarrer ou se terminer par "*" comme joker)
+pseudo: pseudo ou masque (le caractère joker "*" est autorisé)
      *: donner la voix à tout le monde sur le canal
 ----
 
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index ba2c47708..bcc6e54b7 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -174,7 +174,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `"$nick"`)
 
 * [[option_irc.look.highlight_tags_restrict]] *irc.look.highlight_tags_restrict*
-** description: `restreindre les highlights à ces étiquettes sur les tampons irc (pour avoir un highlight seulement sur les messages utilisateur et pas les messages du serveur); les étiquettes doivent être séparées par des virgules et "+" peut être utilisé pour faire un "et" logique entre étiquettes; les étiquettes peuvent commencer ou se terminer par "*" pour correspondre à plus d'une étiquette; une valeur vide autorise le highlight sur n'importe quelle étiquette`
+** description: `restreindre les highlights à ces étiquettes sur les tampons irc (pour avoir un highlight seulement sur les messages utilisateur et pas les messages du serveur); les étiquettes doivent être séparées par des virgules et "+" peut être utilisé pour faire un "et" logique entre étiquettes; le caractère joker "*" est autorisé dans les étiquettes; une valeur vide autorise le highlight sur n'importe quelle étiquette`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"irc_privmsg,irc_notice"`)
 
diff --git a/doc/fr/autogen/user/trigger_commands.txt b/doc/fr/autogen/user/trigger_commands.txt
index 849b50b45..7145cd5b4 100644
--- a/doc/fr/autogen/user/trigger_commands.txt
+++ b/doc/fr/autogen/user/trigger_commands.txt
@@ -56,7 +56,7 @@ code_retour: code retour dans le callback (ok (par défaut), ok_eat, error)
        -all: effectuer l'action sur tous les triggers
     default: restaurer les triggers par défaut
     monitor: ouvrir le tampon moniteur des triggers
-     filtre: filtrer les hooks/triggers à afficher (un hook doit commencer par "@", par exemple "@signal"), plusieurs filtres peuvent être séparés par des virgules; chaque nom de trigger peut commencer ou se terminer par "*"
+     filtre: filtrer les hooks/triggers à afficher (un hook doit commencer par "@", par exemple "@signal"), plusieurs filtres peuvent être séparés par des virgules; le caractère joker "*" est autorisé dans chaque nom de trigger
 
 Lorsqu'un callback de trigger est appelé, les actions suivantes sont exécutées, dans cet ordre :
   1. vérifier les conditions; si faux, sortir
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index aba674e0d..6bfddd767 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -314,10 +314,10 @@ Exemples (conditions):
             - il s'agit du nom complet incluant l'extension (exemple: "irc.freenode.#weechat")
             - "*" signifie tous les tampons
             - un nom commençant par '!' est exclu
-            - le nom peut commencer ou se terminer par '*' pour plusieurs tampons
+            - le caractère joker "*" est autorisé
 étiquettes: liste d'étiquettes, séparées par des virgules, par exemple: "irc_join,irc_part,irc_quit"
             - "et" logique: utilisez "+" entre les étiquettes (par exemple: "nick_toto+irc_action")
-            - les étiquettes peuvent commencer ou se terminer par '*'
+            - le caractère joker "*" est autorisé
      regex: expression régulière POSIX étendue à 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 '!')
@@ -475,7 +475,7 @@ Pour le contexte "mouse" (possible aussi pour le contexte "cursor"), la touche a
    bar(xxx): la barre "xxx"
     item(*): n'importe quel objet de barre
   item(xxx): l'objet de barre "xxx"
-La touche peut commencer ou se terminer par '*' pour plusieurs évènements de la souris.
+La caractère joker "*" est autorisé pour plusieurs évènements de la souris.
 Une valeur spéciale pour la commande avec le format "hsignal:nom" peut être utilisée dans le contexte "mouse", cela enverra le signal "nom" avec la table de hachage du focus comme paramètre.
 Une autre valeur spéciale "-" peut être utilisée pour désactiver la touche (elle sera ignorée lors de la recherche de touches).
 
@@ -758,7 +758,7 @@ Exemples :
 /set  [<option> [<valeur>]]
       diff [<option> [<option>...]]
 
-option: nom d'une option (peut démarrer ou se terminer par '*' pour lister plusieurs options)
+option: nom d'une option (le caractère joker "*" est autorisé)
 valeur: nouvelle valeur pour l'option
   diff: afficher seulement les options modifiées
 
@@ -787,7 +787,7 @@ Exemples:
 ----
 /unset  <option>
 
-option: nom d'une option (peut commencer ou se terminer par "*" pour réinitialiser plusieurs options, à utiliser avec prudence !)
+option: nom d'une option (le caractère joker "*" est autorisé pour réinitialiser plusieurs options, à utiliser avec prudence !)
 
 Selon l'option, elle est réinitialisée (pour les options standards) ou supprimée (pour les options facultatives, comme les valeurs pour les serveurs).
 
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 80c1a311c..2144cfb1d 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -554,7 +554,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** description: `liste des étiquettes pour le highlight (séparées par des virgules); la comparaison ne tient pas compte de la casse; chaque étiquette peut commencer ou se terminer par "*" pour correspondre à plus d'une étiquette; plusieurs étiquettes peuvent être séparées par "+" pour faire un "et" logique entre les étiquettes; exemples: "nick_flashcode" pour les messages du pseudo "FlashCode", "irc_notice+nick_toto*" pour les notices d'un pseudo commençant par "toto"`
+** description: `liste des étiquettes pour le highlight (séparées par des virgules); la comparaison ne tient pas compte de la casse; le caractère joker "*" est autorisé dans chaque étiquette; plusieurs étiquettes peuvent être séparées par "+" pour faire un "et" logique entre les étiquettes; 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: `""`)
 
@@ -899,7 +899,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** description: `liste des extensions à charger automatiquement au démarrage (séparées par des virgules), "*" signifie toutes les extensions trouvées, un nom commençant par "!" est une valeur négative pour empêcher une extension d'être chargée, les noms peuvent commencer ou se terminer par "*" pour indiquer plusieurs extensions (exemples: "*" ou "*,!lua,!tcl")`
+** description: `liste des extensions à charger automatiquement au démarrage (séparées par des virgules), "*" signifie toutes les extensions trouvées, un nom commençant par "!" est une valeur négative pour empêcher une extension d'être chargée, le caractère joker "*" est autorisé dans les noms (exemples: "*" ou "*,!lua,!tcl")`
 ** 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 beb5c289e..3c90b2dbc 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -818,6 +818,8 @@ length = weechat.strlen_screen("é") # 1
 
 ==== weechat_string_match
 
+_Mis à jour dans la 0.4.4._
+
 Vérifier si une chaîne correspond à un masque.
 
 Prototype :
@@ -831,10 +833,14 @@ int weechat_string_match (const char *string, const char *mask,
 Paramètres :
 
 * 'string' : chaîne
-* 'mask' : masque, peut commencer ou se terminer par "`*`" (aucune autre "`*`"
-  n'est autorisée dans le masque)
+* 'mask' : masque avec des caractères joker ("*"), chaque joker correspond à 0
+  ou plusieurs caractères dans la chaîne
 * 'case_sensitive' : 1 pour une comparaison tenant compte de la casse, sinon 0
 
+[NOTE]
+Depuis la version 0.4.4, les caractères joker sont autorisés à l'intérieur du
+masque (pas seulement au début et à la fin du masque).
+
 Valeur de retour :
 
 * 1 si la chaîne correspond au masque, sinon 0
@@ -843,10 +849,11 @@ Exemple en C :
 
 [source,C]
 ----
-int match1 = weechat_string_match ("abcdef", "abc*", 0); /* == 1 */
-int match2 = weechat_string_match ("abcdef", "*dd*", 0); /* == 0 */
-int match3 = weechat_string_match ("abcdef", "*def", 0); /* == 1 */
-int match4 = weechat_string_match ("abcdef", "*de*", 0); /* == 1 */
+int match1 = weechat_string_match ("abcdef", "abc*", 0);  /* == 1 */
+int match2 = weechat_string_match ("abcdef", "*dd*", 0);  /* == 0 */
+int match3 = weechat_string_match ("abcdef", "*def", 0);  /* == 1 */
+int match4 = weechat_string_match ("abcdef", "*de*", 0);  /* == 1 */
+int match5 = weechat_string_match ("abcdef", "*b*d*", 0); /* == 1 */
 ----
 
 Script (Python) :
@@ -857,10 +864,11 @@ Script (Python) :
 match = weechat.string_match(string, mask, case_sensitive)
 
 # exemples
-match1 = weechat.string_match("abcdef", "abc*", 0) # 1
-match2 = weechat.string_match("abcdef", "*dd*", 0) # 0
-match3 = weechat.string_match("abcdef", "*def", 0) # 1
-match4 = weechat.string_match("abcdef", "*de*", 0) # 1
+match1 = weechat.string_match("abcdef", "abc*", 0)  # 1
+match2 = weechat.string_match("abcdef", "*dd*", 0)  # 0
+match3 = weechat.string_match("abcdef", "*def", 0)  # 1
+match4 = weechat.string_match("abcdef", "*de*", 0)  # 1
+match5 = weechat.string_match("abcdef", "*b*d*", 0) # 1
 ----
 
 ==== weechat_string_expand_home
@@ -6946,8 +6954,7 @@ struct t_hook *weechat_hook_command_run (const char *command,
 
 Paramètres :
 
-* 'command' : commande à intercepter, peut commencer ou se terminer par le
-  caractère joker "*"
+* 'command' : commande à intercepter (le caractère joker "*" est autorisé)
   (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
 * 'callback' : fonction appelée lorsque la commande est exécutée, paramètres et
   valeur de retour :
@@ -7706,8 +7713,7 @@ Paramètres :
 ** avec WeeChat ≥ 0.4.3 : liste d'étiquettes (séparées par des virgules) qui
    doivent être dans le message ("ou" logique); il est possible de combiner
    plusieurs étiquettes sous forme d'un "et" logique avec le séparateur "+";
-   chaque étiquette peut commencer ou se terminer par "*" pour correspondre à
-   plusieurs étiquettes
+   le caractère joker "*" est autorisé dans les étiquettes
 ** avec WeeChat ≤ 0.4.2 : liste d'étiquettes (séparées par des virgules) qui
    doivent toutes être dans le message ("et" logique)
 * 'message' : seulement les messages contenant cette chaîne seront interceptés
@@ -7788,7 +7794,7 @@ struct t_hook *weechat_hook_signal (const char *signal,
 
 Paramètres :
 
-* 'signal' : signal à intercepter, peut commencer ou se terminer par "*"
+* 'signal' : signal à intercepter, le caractère joker "*" est autorisé
   (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
   (voir le tableau ci-dessous)
 * 'callback' : fonction appelée quand le signal est reçu, paramètres et valeur
@@ -8657,7 +8663,7 @@ struct t_hook *weechat_hook_hsignal (const char *signal,
 
 Paramètres :
 
-* 'signal' : signal à intercepter, peut commencer ou se terminer par "*"
+* 'signal' : signal à intercepter, le caractère joker "*" est autorisé
   (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
   (voir le tableau ci-dessous)
 * 'callback' : fonction appelée quand le signal est reçu, paramètres et valeur
@@ -9024,8 +9030,9 @@ struct t_hook *weechat_hook_config (const char *option,
 Paramètres :
 
 * 'option' : option, le format est le nom complet, celui utilisé avec la
-  commande `/set` (par exemple : `weechat.look.item_time_format`)
-  (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
+  commande `/set` (par exemple : `weechat.look.item_time_format`), le caractère
+  joker "*" est autorisé (priorité autorisée, voir la note sur la
+  <<hook_priority,priorité>>)
 * 'callback' : fonction appelée lorsque l'option de configuration est modifiée,
   paramètres et valeur de retour :
 ** 'void *data' : pointeur
@@ -10988,8 +10995,7 @@ Paramètres :
 * 'string' : liste de tampons, séparés par des virgules :
 ** "*" signifie tous les tampons
 ** un nom commençant par "!" est exclu
-** un nom peut commencer ou se terminer par "*" pour correspondre à plusieurs
-   tampons
+** le caractère joker "*" est autorisé dans le nom
 
 Valeur de retour :
 
diff --git a/doc/it/autogen/plugin_api/infolists.txt b/doc/it/autogen/plugin_api/infolists.txt
index 187a33b60..22d795b09 100644
--- a/doc/it/autogen/plugin_api/infolists.txt
+++ b/doc/it/autogen/plugin_api/infolists.txt
@@ -2,9 +2,9 @@
 |===
 | Plugin | Nome | Descrizione | Puntatore | Argomenti
 
-| alias | alias | elenco di alias | puntatore all'alias (opzionale) | nome alias (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| alias | alias | elenco di alias | puntatore all'alias (opzionale) | alias name (wildcard "*" is allowed) (optional)
 
-| guile | guile_script | elenco degli script | puntatore allo script (opzionale) | nome script (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| guile | guile_script | elenco degli script | puntatore allo script (opzionale) | script name (wildcard "*" is allowed) (optional)
 
 | irc | irc_channel | elenco dei canali per un server IRC | puntatore al canale (opzionale) | server,canale (canale è opzionale)
 
@@ -12,41 +12,41 @@
 
 | irc | irc_nick | elenco dei nick per un canale IRC | puntatore al nick (opzionale) | server,canale,nick (canale e nick sono opzionali)
 
-| irc | irc_notify | elenco delle notifiche | puntatore alla notifica (opzionale) | nome server (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| irc | irc_notify | elenco delle notifiche | puntatore alla notifica (opzionale) | server name (wildcard "*" is allowed) (optional)
 
-| irc | irc_server | elenco di server IRC | puntatore al server (opzionale) | nome server (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| irc | irc_server | elenco di server IRC | puntatore al server (opzionale) | server name (wildcard "*" is allowed) (optional)
 
 | logger | logger_buffer | elenco dei buffer logger | puntatore al logger (opzionale) | -
 
-| lua | lua_script | elenco degli script | puntatore allo script (opzionale) | nome script (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| lua | lua_script | elenco degli script | puntatore allo script (opzionale) | script name (wildcard "*" is allowed) (optional)
 
-| perl | perl_script | elenco degli script | puntatore allo script (opzionale) | nome script (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| perl | perl_script | elenco degli script | puntatore allo script (opzionale) | script name (wildcard "*" is allowed) (optional)
 
-| python | python_script | elenco degli script | puntatore allo script (opzionale) | nome script (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| python | python_script | elenco degli script | puntatore allo script (opzionale) | script name (wildcard "*" is allowed) (optional)
 
 | relay | relay | elenco di client relay | puntatore al relay (opzionale) | -
 
-| ruby | ruby_script | elenco degli script | puntatore allo script (opzionale) | nome script (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| ruby | ruby_script | elenco degli script | puntatore allo script (opzionale) | script name (wildcard "*" is allowed) (optional)
 
-| script | script_script | elenco degli script | puntatore allo script (opzionale) | nome script con l'estensione (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| script | script_script | elenco degli script | puntatore allo script (opzionale) | script name with extension (wildcard "*" is allowed) (optional)
 
-| tcl | tcl_script | elenco degli script | puntatore allo script (opzionale) | nome script (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| tcl | tcl_script | elenco degli script | puntatore allo script (opzionale) | script name (wildcard "*" is allowed) (optional)
 
-| weechat | bar | elenco delle barre | puntatore alla barra (opzionale) | nome barra (può iniziare o terminare con "*" come carattere jolly (opzionale)
+| weechat | bar | elenco delle barre | puntatore alla barra (opzionale) | bar name (wildcard "*" is allowed) (optional)
 
-| weechat | bar_item | elenco degli elementi barra | puntatore all'elemento della barra (opzionale) | nome dell'elemento della barra (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | bar_item | elenco degli elementi barra | puntatore all'elemento della barra (opzionale) | bar item name (wildcard "*" is allowed) (optional)
 
 | weechat | bar_window | elenco delle finestre barra | puntatore alla finestra della barra (opzionale) | -
 
-| weechat | buffer | elenco dei buffer | puntatore al buffer (opzionale) | nome buffer (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | buffer | elenco dei buffer | puntatore al buffer (opzionale) | buffer name (wildcard "*" is allowed) (optional)
 
 | weechat | buffer_lines | righe di un buffer | puntatore al buffer | -
 
-| weechat | filter | elenco dei filtri | - | nome filtro (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | filter | elenco dei filtri | - | filter name (wildcard "*" is allowed) (optional)
 
 | weechat | history | cronologia dei comandi | puntatore al buffer (se non impostato, restituisce la cronologia globale) (opzionale) | -
 
-| weechat | hook | elenco di hook | puntatore all'hook (opzionale) | tipo,argomenti (il tipo è comando/timer/.., gli argomenti sono necessari solo per ottenere alcuni hook, (possono iniziare o terminare con "*" come carattere jolly, entrambi sono opzionali)
+| weechat | hook | elenco di hook | puntatore all'hook (opzionale) | type,arguments (type is command/timer/.., arguments to get only some hooks (wildcard "*" is allowed), both are optional)
 
 | weechat | hotlist | elenco dei buffer nella hotlist | - | -
 
@@ -56,11 +56,11 @@
 
 | weechat | nicklist | nick nella lista nick per un buffer | puntatore al buffer | nick_xxx o group_xxx per ottenere solo xxx di nick/group (opzionale)
 
-| weechat | option | elenco delle opzioni | - | nome opzione (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | option | elenco delle opzioni | - | option name (wildcard "*" is allowed) (optional)
 
-| weechat | plugin | elenco dei plugin | puntatore al plugin (opzionale) | nome plugin (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | plugin | elenco dei plugin | puntatore al plugin (opzionale) | plugin name (wildcard "*" is allowed) (optional)
 
-| weechat | proxy | elenco dei proxy | puntatore al proxy (opzionale) | nome del proxy (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | proxy | elenco dei proxy | puntatore al proxy (opzionale) | proxy name (wildcard "*" is allowed) (optional)
 
 | weechat | url_options | opzioni per la URL | - | -
 
diff --git a/doc/it/autogen/user/alias_commands.txt b/doc/it/autogen/user/alias_commands.txt
index 64c7e071c..1b65e4974 100644
--- a/doc/it/autogen/user/alias_commands.txt
+++ b/doc/it/autogen/user/alias_commands.txt
@@ -6,7 +6,7 @@
 
 completion: completion for alias (optional, by default completion is done with target command)
             note: you can use %%command to use completion of an existing command
-     alias: name of alias (can start or end with "*" for alias listing)
+     alias: name of alias (wildcard "*" is allowed)
    command: command name with arguments (many commands can be separated by semicolons)
 
 Without argument, this command lists all defined alias.
diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt
index 4247afd9b..9bfd6c1ab 100644
--- a/doc/it/autogen/user/irc_commands.txt
+++ b/doc/it/autogen/user/irc_commands.txt
@@ -14,7 +14,7 @@ destinazione: nome server
 /allchan  [-current] [-exclude=<canale>[,<canale>...]] <comando> [<argomenti>]
 
  -current: execute command for channels of current server only
- -exclude: exclude some channels ('*' is allowed at beginning or end of channel name, to exclude many channels)
+ -exclude: exclude some channels (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -34,7 +34,7 @@ Examples:
 /allpv  [-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]
 
  -current: execute command for private buffers of current server only
- -exclude: exclude some nicks ('*' is allowed at beginning or end of nick name, to exclude many nicks)
+ -exclude: exclude some nicks (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -55,7 +55,7 @@ Examples:
 ----
 /allserv  [-exclude=<server>[,<server>...]] <comando> [<argomenti>]
 
- -exclude: exclude some servers ('*' is allowed at beginning or end of server name, to exclude many servers)
+ -exclude: exclude some servers (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -155,7 +155,7 @@ Examples:
 ----
 /dehalfop  <nick> [<nick>...]
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: remove channel half-operator status from everybody on channel except yourself
 ----
 
@@ -166,7 +166,7 @@ nick: nick or mask (can start or end with "*" as wildcard)
 /deop  <nick> [<nick>...]
        * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: remove channel operator status from everybody on channel except yourself
 ----
 
@@ -177,7 +177,7 @@ nick: nick or mask (can start or end with "*" as wildcard)
 /devoice  <nick> [<nick>...]
           * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: remove voice from everybody on channel
 ----
 
@@ -209,7 +209,7 @@ destinazione: nome server
 /halfop  <nick> [<nick>...]
          * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: give channel half-operator status to everybody on channel
 ----
 
@@ -498,7 +498,7 @@ Esempi:
 /op  <nick> [<nick>...]
      * -yes
 
-nick: nick or mask (can start or end with "*" as wildcard)
+nick: nick or mask (wildcard "*" is allowed)
    *: give channel operator status to everybody on channel
 ----
 
@@ -838,8 +838,8 @@ server: nome server
 ----
 /voice  <nick> [<nick>...]
 
-nick: nick o mask (può iniziare o terminare con "*" come carattere jolly)
-   *: concede il voice a tutti sul canale
+nick: nick or mask (wildcard "*" is allowed)
+   *: give voice to everybody on channel
 ----
 
 [[command_irc_wallchops]]
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index 4d4bd6d63..d78ebec0c 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -174,7 +174,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `"$nick"`)
 
 * [[option_irc.look.highlight_tags_restrict]] *irc.look.highlight_tags_restrict*
-** descrizione: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; tags can start or end with "*" to match more than one tag; an empty value allows highlight on any tag`
+** descrizione: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; wildcard "*" is allowed in tags; an empty value allows highlight on any tag`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"irc_privmsg,irc_notice"`)
 
diff --git a/doc/it/autogen/user/trigger_commands.txt b/doc/it/autogen/user/trigger_commands.txt
index 553056b7b..5f3c36ac2 100644
--- a/doc/it/autogen/user/trigger_commands.txt
+++ b/doc/it/autogen/user/trigger_commands.txt
@@ -56,7 +56,7 @@ return_code: return code in callback (ok (default), ok_eat, error)
        -all: do action on all triggers
     default: restore default triggers
     monitor: open the trigger monitor buffer, with optional filter:
-     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; each trigger name can start or end with "*"
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
 When a trigger callback is called, following actions are performed, in this order:
   1. check conditions; if false, exit
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 99ac3309d..1369c55dc 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -314,10 +314,10 @@ disable: disable filters
          - 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
+         - wildcard "*" is allowed
    tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
          - logical "and": use "+" between tags (for example: "nick_toto+irc_action")
-         - tags can start or end with '*'
+         - wildcard "*" is allowed
   regex: POSIX extended 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 '!')
@@ -451,44 +451,44 @@ This command is used by key bindings or plugins.
       resetall -yes [<contesto>]
       missing [<contesto>]
 
-       list: elenca tutti i tasti correnti (senza argomento, viene visualizzata questa lista)
-listdefault: elenca i tasti predefiniti
-   listdiff: elenca le differenze tra tasti attuali e predefiniti (tasti aggiunti, ridefiniti o eliminati)
-   contesto: nome del contesto ("default" oppure "search")
-       bind: associa un comando ad un tasto o visualizza il comando associato al tasto (per il contesto "default")
-   bindctxt: associa un comando ad un tasto o mostra il comando associato al tasto, per il contesto fornito
-    comando: comando (più comandi vanno separati da punto e virgola)
-     unbind: rimuove una combinazione di tasti (per il contesto "default")
- unbindctxt: rimuove la combinazione tasti per il contesto fornito
-      reset: ripristina un tasto all'assegnazione predefinita
-  resetctxt: ripristina un tasto alla combinazione predefinita per il contesto fornito
-   resetall: ripristina le combinazioni ai valori predefiniti ed elimina TUTTE le combinazioni personalizzate (usare con cautela!)
-    missing: aggiunge tasti mancanti (usando le combinazioni predefinite), utile dopo l'installazione di una nuova versione di WeeChat
+       list: list all current keys (without argument, this list is displayed)
+listdefault: list default keys
+   listdiff: list differences between current and default keys (keys added, redefined or deleted)
+    context: name of context ("default" or "search")
+       bind: bind a command to a key or display command bound to key (for context "default")
+   bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
+     unbind: remove a key binding (for context "default")
+ unbindctxt: remove a key binding for given context
+      reset: reset a key to default binding (for context "default")
+  resetctxt: reset a key to default binding, for given context
+   resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+    missing: add missing keys (using default bindings), useful after installing new WeeChat version
 
-Al momento di associare un comando ad un tasto si raccomanda di usare il tasto alt+k (oppure Esc e k), e digitare il tasto da associare: il codice tasto verrà inserito nella riga di comando.
+When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key code in command line.
 
-Per il contesto "mouse" (possibile anche nel contesto "cursor"), il formato del tasto è: "@area:tasto" oppure "@area1>area2:tasto" dove area può essere:
-          *: qualunque area sullo schermo
-       chat: area di chat (qualunque buffer)
-  chat(xxx): area di chat per il buffer con il nome "xxx" (nome completo includendo il plugin)
-     bar(*): qualunque barra
-   bar(xxx): barra "xxx"
-    item(*): qualunque elemento barra
-  item(xxx): elemento barra "xxx"
-Il tasto può iniziare o terminare con '*' per corrispondere a più eventi del mouse.
-Un valore speciale per questo comando con il formato "hsignal:nome" può essere usato per il contesto del mouse, e invierà hsignal "nome" con la tabella hash di focuse come argomento.
-Può essere usato un altro valore speciale "-" per disabilitare il tasto (verrà ignorato quando si cercano i tasti).
+For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be:
+          *: any area on screen
+       chat: chat area (any buffer)
+  chat(xxx): char area for buffer with name "xxx" (full name including plugin)
+     bar(*): any bar
+   bar(xxx): bar "xxx"
+    item(*): any bar item
+  item(xxx): bar item "xxx"
+Wildcard "*" is allowed in key to match many mouse events.
+A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
+Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
-Esempi:
-  il tasto alt-x per alternare la barra della nicklist:
+Examples:
+  key alt-x to toggle nicklist bar:
     /key bind meta-x /bar toggle nicklist
-  il tasto alt-r per passare al canale IRC #weechat:
+  key alt-r to jump to #weechat IRC channel:
     /key bind meta-r /buffer #weechat
-  ripristinare la combinazione predefinita per il tasto alt-r:
+  restore default binding for key alt-r:
     /key reset meta-r
-  il tasto "tab" per interrompere la ricerca nel buffer:
+  key "tab" to stop search in buffer:
     /key bindctxt search ctrl-I /input search_stop
-  il tasto centrale del mouse su un nick per ottenere le informazioni:
+  middle button of mouse on a nick to retrieve info on nick:
     /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick}
 ----
 
@@ -758,26 +758,26 @@ Examples:
 /set  [<opzione> [<valore>]]
       diff [<opzione> [<opzione>...]]
 
-opzione: nome di un'opzione (può iniziare o terminare con '*' per elencare più opzioni)
- valore: nuovo valore per l'opzione
-   diff: mostra solo le opzioni modificate
+option: name of an option (wildcard "*" is allowed)
+ value: new value for option
+  diff: display only changed options
 
-Il nuovo valore può essere, a seconda del tipo di variabile:
-  booleano: on, off o toggle
-  intero  : numero, ++numero o --numero
-  stringa : qualsiasi stringa ("" per una stringa vuota)
-  colore  : nome colore, ++numeero o --numero
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-Per tutti i tipi, è possibile usare null per rimuovere il valore dell'opzione (valore non definito). Ciò funziona solo per alcune variabili speciali dei plugin.
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-Esempi:
-  mostra le opzioni relative alle notifiche:
+Examples:
+  display options about highlight:
     /set *highlight*
-  aggiunge una parola alle notifiche:
+  add a word to highlight:
     /set weechat.look.highlight "word"
-  mostra le opzioni modificate:
+  display changed options:
     /set diff
-  mostra le opzioni modificate nel plugin irc:
+  display changed options in irc plugin:
     /set diff irc.*
 ----
 
@@ -787,14 +787,14 @@ Esempi:
 ----
 /unset  <opzione>
 
-opzione: nome di un'opzione (può iniziare o terminare con "*" per il ripristino di più opzioni, attenzione!)
+option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
 
-A seconda dell'opzione, essa viene ripristinata (per le opzioni standard) o rimossa (per le impostazioni opzionali, come i valori del server).
+According to option, it's reset (for standard options) or removed (for optional settings, like server values).
 
-Esempi:
-  ripristina un'opzione:
+Examples:
+  reset one option:
     /unset weechat.look.item_time_format
-  ripristina tutte le opzioni del colore:
+  reset all color options:
     /unset weechat.color.*
 ----
 
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 6a3195562..966009962 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -554,7 +554,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** 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"`
+** descrizione: `comma separated list of tags to highlight; case insensitive comparison; wildcard "*" is allowed in each 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: `""`)
 
@@ -899,7 +899,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** descrizione: `elenco separato da virgole di plugin da caricare automaticamente all'avvio, "*" equivale a tutti i plugin trovati. un nome che comincia con "!" è un valore negativo per impedire il caricamento di un plugin, i nomi possono  iniziare o finire con "*" per corrispondere a più plugin (esempi: "*" oppure "*,!lua,!tcl")`
+** descrizione: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, wildcard "*" is allowed in names (examples: "*" or "*,!lua,!tcl")`
 ** 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 75a612ca2..1d9a8ace9 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -826,6 +826,9 @@ length = weechat.strlen_screen("é") # 1
 
 ==== weechat_string_match
 
+// TRANSLATION MISSING
+_Updated in 0.4.4._
+
 Verifica se una stringa coincide ad una mask.
 
 Prototipo:
@@ -839,10 +842,16 @@ int weechat_string_match (const char *string, const char *mask,
 Argomenti:
 
 * 'string': stringa
-* 'mask': mask, può iniziare o terminare con "`*`" (nessun altro "`*`"
-  consentito all'interno della mask)
+// TRANSLATION MISSING
+* 'mask': mask with wildcards ("*"), each wildcard matches 0 or more chars in
+  the string
 * 'case_sensitive': 1 per il confronto sensibile alle maiuscole, altrimenti 0
 
+// TRANSLATION MISSING
+[NOTE]
+Since version 0.4.4, wildcards are allowed inside the mask
+(not only beginning/end of mask).
+
 Valore restituito:
 
 * 1 se la stringa coincide alla mask, altrimenti 0
@@ -851,10 +860,11 @@ Esempio in C:
 
 [source,C]
 ----
-int match1 = weechat_string_match ("abcdef", "abc*", 0); /* == 1 */
-int match2 = weechat_string_match ("abcdef", "*dd*", 0); /* == 0 */
-int match3 = weechat_string_match ("abcdef", "*def", 0); /* == 1 */
-int match4 = weechat_string_match ("abcdef", "*de*", 0); /* == 1 */
+int match1 = weechat_string_match ("abcdef", "abc*", 0);  /* == 1 */
+int match2 = weechat_string_match ("abcdef", "*dd*", 0);  /* == 0 */
+int match3 = weechat_string_match ("abcdef", "*def", 0);  /* == 1 */
+int match4 = weechat_string_match ("abcdef", "*de*", 0);  /* == 1 */
+int match5 = weechat_string_match ("abcdef", "*b*d*", 0); /* == 1 */
 ----
 
 Script (Python):
@@ -865,10 +875,11 @@ Script (Python):
 match = weechat.string_match(string, mask, case_sensitive)
 
 # esempio
-match1 = weechat.string_match("abcdef", "abc*", 0) # 1
-match2 = weechat.string_match("abcdef", "*dd*", 0) # 0
-match3 = weechat.string_match("abcdef", "*def", 0) # 1
-match4 = weechat.string_match("abcdef", "*de*", 0) # 1
+match1 = weechat.string_match("abcdef", "abc*", 0)  # 1
+match2 = weechat.string_match("abcdef", "*dd*", 0)  # 0
+match3 = weechat.string_match("abcdef", "*def", 0)  # 1
+match4 = weechat.string_match("abcdef", "*de*", 0)  # 1
+match5 = weechat.string_match("abcdef", "*b*d*", 0) # 1
 ----
 
 ==== weechat_string_expand_home
@@ -6942,7 +6953,8 @@ struct t_hook *weechat_hook_command_run (const char *command,
 
 Argomenti:
 
-* 'command': comando su cui eseguire l'hook, può iniziare o terminare con "*"
+// TRANSLATION MISSING
+* 'command': comando su cui eseguire l'hook (wildcard "*" is allowed)
   (priorità consentita, consultare la nota riguardo la
   <<hook_priority,priority>>)
 * 'callback': funzione chiamata quando il comando è in esecuzione, argomenti e
@@ -7701,7 +7713,7 @@ Argomenti:
 // TRANSLATION MISSING
 ** with WeeChat ≥ 0.4.3: comma-separated list of tags that must be in message
    (logical "or"); it is possible to combine many tags as a logical "and" with
-   separator "+"; each tag can start or end with "*" to match many tags
+   separator "+"; wildcard "*" is allowed in tags
 // TRANSLATION MISSING
 ** with WeeChat ≤ 0.4.2: comma-separated list of tags that must all be in
    message (logical "and")
@@ -7783,7 +7795,7 @@ struct t_hook *weechat_hook_signal (const char *signal,
 Argomenti:
 
 // TRANSLATION MISSING
-* 'signal': segnale da catturare, può iniziare o terminare con "*"
+* 'signal': segnale da catturare, wildcard "*" is allowed
   (priorità consentita, consultare la nota riguardo la
   <<hook_priority,priority>>), see table below
 * 'callback': funzione chiamata a segnale ricevuto, argomenti e valore
@@ -8717,7 +8729,7 @@ struct t_hook *weechat_hook_hsignal (const char *signal,
 Argomenti:
 
 // TRANSLATION MISSING
-* 'signal': segnale da catturare, può iniziare o terminare con "*"
+* 'signal': segnale da catturare, wildcard "*" is allowed
   (priorità consentita, consultare la nota a proposito di <<hook_priority,priority>>),
   see table below
 * 'callback': funzione chiamata a segnale ricevuto, argomenti e valore
@@ -9086,8 +9098,9 @@ struct t_hook *weechat_hook_config (const char *option,
 
 Argomenti:
 
+// TRANSLATION MISSING
 * 'option': opzione, il formato è il nome completo, come usato con il comando
-  `/set` (ad esempio: `weechat.look.item_time_format`)
+  `/set` (ad esempio: `weechat.look.item_time_format`), wildcard "*" is allowed
   (priorità consentita, consultare la note riguardo la
   <<hook_priority,priority>>)
 * 'callback': funzione chiamata quando l'opzione di configurazione è cambiata,
@@ -11075,7 +11088,8 @@ Argomenti:
 * 'string': elenco separato da virgole di buffer:
 ** "*" indica tutti i buffer
 ** il nome preceduto da "!" viene escluso
-** il nome può iniziare o terminare con "*" per corrispondere a più buffer
+// TRANSLATION MISSING
+** wildcard "*" is allowed in name
 
 Valore restituito:
 
diff --git a/doc/ja/autogen/plugin_api/infolists.txt b/doc/ja/autogen/plugin_api/infolists.txt
index d08ab69d1..7ff7f8b8c 100644
--- a/doc/ja/autogen/plugin_api/infolists.txt
+++ b/doc/ja/autogen/plugin_api/infolists.txt
@@ -2,9 +2,9 @@
 |===
 | プラグイン | 名前 | 説明 | ポインタ | 引数
 
-| alias | alias | 別名のリスト | 別名のポインタ (任意) | 別名の名前 (ワイルドカードとして "*" で始めるか終わるかできます) (任意)
+| alias | alias | 別名のリスト | 別名のポインタ (任意) | alias name (wildcard "*" is allowed) (optional)
 
-| guile | guile_script | スクリプトのリスト | スクリプトポインタ (任意) | スクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| guile | guile_script | スクリプトのリスト | スクリプトポインタ (任意) | script name (wildcard "*" is allowed) (optional)
 
 | irc | irc_channel | IRC サーバのチャンネルリスト | チャンネルポインタ (任意) | server,channel (チャンネルは任意)
 
@@ -12,41 +12,41 @@
 
 | irc | irc_nick | IRC チャンネルのニックネームのリスト | ニックネームポインタ (任意) | server,channel,nick (チャンネルとニックネームは任意)
 
-| irc | irc_notify | 通知のリスト | 通知ポインタ (任意) | サーバ名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| irc | irc_notify | 通知のリスト | 通知ポインタ (任意) | server name (wildcard "*" is allowed) (optional)
 
-| irc | irc_server | IRC サーバのリスト | サーバポインタ (任意) | サーバ名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| irc | irc_server | IRC サーバのリスト | サーバポインタ (任意) | server name (wildcard "*" is allowed) (optional)
 
 | logger | logger_buffer | logger バッファのリスト | logger ポインタ (任意) | -
 
-| lua | lua_script | スクリプトのリスト | スクリプトポインタ (任意) | スクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| lua | lua_script | スクリプトのリスト | スクリプトポインタ (任意) | script name (wildcard "*" is allowed) (optional)
 
-| perl | perl_script | スクリプトのリスト | スクリプトポインタ (任意) | スクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| perl | perl_script | スクリプトのリスト | スクリプトポインタ (任意) | script name (wildcard "*" is allowed) (optional)
 
-| python | python_script | スクリプトのリスト | スクリプトポインタ (任意) | スクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| python | python_script | スクリプトのリスト | スクリプトポインタ (任意) | script name (wildcard "*" is allowed) (optional)
 
 | relay | relay | リレークライアントのリスト | リレーポインタ (任意) | -
 
-| ruby | ruby_script | スクリプトのリスト | スクリプトポインタ (任意) | スクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| ruby | ruby_script | スクリプトのリスト | スクリプトポインタ (任意) | script name (wildcard "*" is allowed) (optional)
 
-| script | script_script | スクリプトのリスト | スクリプトポインタ (任意) | 拡張子を含めたスクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| script | script_script | スクリプトのリスト | スクリプトポインタ (任意) | script name with extension (wildcard "*" is allowed) (optional)
 
-| tcl | tcl_script | スクリプトのリスト | スクリプトポインタ (任意) | スクリプト名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| tcl | tcl_script | スクリプトのリスト | スクリプトポインタ (任意) | script name (wildcard "*" is allowed) (optional)
 
-| weechat | bar | バーのリスト | バーポインタ (任意) | バー名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | bar | バーのリスト | バーポインタ (任意) | bar name (wildcard "*" is allowed) (optional)
 
-| weechat | bar_item | バーアイテムのリスト | バーアイテムポインタ (任意) | バーアイテム名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | bar_item | バーアイテムのリスト | バーアイテムポインタ (任意) | bar item name (wildcard "*" is allowed) (optional)
 
 | weechat | bar_window | バーウィンドウのリスト | バーウィンドウポインタ (任意) | -
 
-| weechat | buffer | バッファのリスト | バッファポインタ (任意) | バッファ名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | buffer | バッファのリスト | バッファポインタ (任意) | buffer name (wildcard "*" is allowed) (optional)
 
 | weechat | buffer_lines | バッファの行数 | バッファポインタ | -
 
-| weechat | filter | フィルタのリスト | - | フィルタ名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | filter | フィルタのリスト | - | filter name (wildcard "*" is allowed) (optional)
 
 | weechat | history | コマンドの履歴 | バッファポインタ (ワイルドカードとして "*" で始めるか終われる) (任意) | -
 
-| weechat | hook | フックリスト | フックポインタ (任意) | type,arguments (type はコマンド/タイマー/..、arguments はいくつかのフックで必要 (ワイルドカードとして "*" で始めるか終われる)、両方とも任意)
+| weechat | hook | フックリスト | フックポインタ (任意) | type,arguments (type is command/timer/.., arguments to get only some hooks (wildcard "*" is allowed), both are optional)
 
 | weechat | hotlist | ホットリストに含まれるバッファ | - | -
 
@@ -56,11 +56,11 @@
 
 | weechat | nicklist | バッファのニックネームリスト内のニックネーム | バッファポインタ | ニックネーム/グループ xxx のみについて取得するには nick_xxx または group_xxx を使う (任意)
 
-| weechat | option | オプションリスト | - | オプション名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | option | オプションリスト | - | option name (wildcard "*" is allowed) (optional)
 
-| weechat | plugin | プラグインリスト | プラグインポインタ (任意) | プラグイン名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | plugin | プラグインリスト | プラグインポインタ (任意) | plugin name (wildcard "*" is allowed) (optional)
 
-| weechat | proxy | プロキシリスト | プロキシポインタ (任意) | プロキシ名 (ワイルドカードとして "*" で始めるか終われる) (任意)
+| weechat | proxy | プロキシリスト | プロキシポインタ (任意) | proxy name (wildcard "*" is allowed) (optional)
 
 | weechat | url_options | URL のオプション | - | -
 
diff --git a/doc/ja/autogen/user/alias_commands.txt b/doc/ja/autogen/user/alias_commands.txt
index bbf22a79b..5bca7a466 100644
--- a/doc/ja/autogen/user/alias_commands.txt
+++ b/doc/ja/autogen/user/alias_commands.txt
@@ -4,31 +4,31 @@
 ----
 /alias  [-completion <completion>] <alias> [<command> [;<command>...]]
 
-completion: 別名の補完 (任意、デフォルトではターゲットコマンドを伴って補完される)
-            注意: %%command で存在するコマンドの補完を利用可能
-     alias: 別名の名前 ("*" で始めるか終われば別名をリストアップ)
-   command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを指定できる)
+completion: completion for alias (optional, by default completion is done with target command)
+            note: you can use %%command to use completion of an existing command
+     alias: name of alias (wildcard "*" is allowed)
+   command: command name with arguments (many commands can be separated by semicolons)
 
-引数無しでは、定義済み別名をリストアップ。
+Without argument, this command lists all defined alias.
 
-注意: command の中では、特殊変数の置換が行われる:
-        $n: 'n' 番目の引数 (1 から 9)
-       $-m: 1 から 'm' 番目の引数
-       $n-: 'n' 番目から最後の引数
-      $n-m: 'n' から 'm' 番目の引数
-        $*: 全ての引数
-        $~: 最後の引数
-      $var: ここで "var" とはバッファの局所変数 (/buffer localvar を参照)
-            例: $nick、$channel、$server、$plugin、$name
+Note: in command, special variables are replaced:
+        $n: argument 'n' (between 1 and 9)
+       $-m: arguments from 1 to 'm'
+       $n-: arguments from 'n' to last
+      $n-m: arguments from 'n' to 'm'
+        $*: all arguments
+        $~: last argument
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
+            examples: $nick, $channel, $server, $plugin, $name
 
-別名を削除するには /unalias コマンドを使ってください:
+To remove an alias, use command /unalias.
 
-例:
-  /split をウィンドウを水平方向に分割する別名と定義:
+Examples:
+  alias /split to split window horizontally:
     /alias split /window splith
-  /hello を #weechat を除く全てのチャンネルで "hello" と発言する別名と定義:
+  alias /hello to say "hello" on all channels but not on #weechat:
     /alias hello /allchan -exclude=#weechat msg * hello
-  /forcejoin を /sajoin の補完候補を使い IRC コマンド "forcejoin" を送信する別名と定義:
+  alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin:
     /alias -completion %%sajoin forcejoin /quote forcejoin
 ----
 
diff --git a/doc/ja/autogen/user/irc_commands.txt b/doc/ja/autogen/user/irc_commands.txt
index dac8e233b..1c2f2abc6 100644
--- a/doc/ja/autogen/user/irc_commands.txt
+++ b/doc/ja/autogen/user/irc_commands.txt
@@ -13,17 +13,17 @@ target: サーバ名
 ----
 /allchan  [-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]
 
- -current: 現在のサーバ上のチャンネルに対してコマンドを実行
- -exclude: 一部のチャンネルを除外 (複数のチャンネルを除外するには '*' をチャンネル名の最初と最後につける)
-  command: 実行するコマンド
-arguments: コマンドの引数 (特殊変数 $nick、$channel、$server はそれぞれの値に置き換えられます)
+ -current: execute command for channels of current server only
+ -exclude: exclude some channels (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-例:
-  全てのチャンネルに対して '/me is testing' を実行:
+Examples:
+  execute '/me is testing' on all channels:
     /allchan me is testing
-  #weechat 以外の全てのチャンネルで 'hello' と発言:
+  say 'hello' everywhere but not on #weechat:
     /allchan -exclude=#weechat msg * hello
-  #weechat と #linux で始まるチャンネルを除く全てのチャンネルで 'hello' と発言:
+  say 'hello' everywhere but not on #weechat and channels beginning with #linux:
     /allchan -exclude=#weechat,#linux* msg * hello
 ----
 
@@ -33,19 +33,19 @@ arguments: コマンドの引数 (特殊変数 $nick、$channel、$server はそ
 ----
 /allpv  [-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]
 
- -current: 現在のサーバ上のプライベートバッファに対してコマンドを実行
- -exclude: 一部のニックネームを除外 (複数のニックネームを除外するには '*' をニックネームの最初と最後につける)
-  command: 実行するコマンド
-arguments: コマンドの引数 (特殊変数 $nick、$channel、$server はそれぞれの値に置き換えられます)
+ -current: execute command for private buffers of current server only
+ -exclude: exclude some nicks (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-例:
-  全てのプライベートバッファに対して '/me is testing' を実行:
+Examples:
+  execute '/me is testing' on all private buffers:
     /allpv me is testing
-  ニックネーム foo を除く全てのプライベートバッファで 'hello' と発言:
+  say 'hello' everywhere but not for nick foo:
     /allpv -exclude=foo msg * hello
-  ニックネーム foo と bar で始まるニックネームを除く全てのチャンネルで 'hello' と発言:
+  say 'hello' everywhere but not for nick foo and nicks beginning with bar:
     /allpv -exclude=foo,bar* msg * hello
-  全てのプライベートバッファを閉じる:
+  close all private buffers:
     /allpv close
 ----
 
@@ -55,16 +55,16 @@ arguments: コマンドの引数 (特殊変数 $nick、$channel、$server はそ
 ----
 /allserv  [-exclude=<server>[,<server>...]] <command> [<arguments>]
 
- -exclude: いくつかのサーバを除外 (複数のサーバを除外するには '*' をサーバ名の最初と最後につける)
-  command: 実行するコマンド
-arguments: コマンドの引数 (特殊変数 $nick、$channel、$server はそれぞれの値に置き換えられます)
+ -exclude: exclude some servers (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-例:
-  全てのサーバでニックネーム変更:
+Examples:
+  change nick on all servers:
     /allserv nick newnick
-  全てのサーバで離席状態を変更:
+  set away on all servers:
     /allserv away I'm away
-  すべてのサーバで自分のニックネームに対して whois を実行:
+  do a whois on my nick on all servers:
     /allserv whois $nick
 ----
 
@@ -155,8 +155,8 @@ file: ファイルネーム (ローカルホスト上の)
 ----
 /dehalfop  <nick> [<nick>...]
 
-nick: ニックネームまたはマスク (ワイルドカード "*" を最初と最後につけることが可能)
-   *: 自分以外のチャンネル参加者からチャンネルの half-operator 権を剥奪
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove channel half-operator status from everybody on channel except yourself
 ----
 
 [[command_irc_deop]]
@@ -166,8 +166,8 @@ nick: ニックネームまたはマスク (ワイルドカード "*" を最初
 /deop  <nick> [<nick>...]
        * -yes
 
-nick: ニックネームまたはマスク (ワイルドカード "*" を最初と最後につけることが可能)
-   *: 自分以外のチャンネル参加者からチャンネルオペレータ権を剥奪
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove channel operator status from everybody on channel except yourself
 ----
 
 [[command_irc_devoice]]
@@ -177,8 +177,8 @@ nick: ニックネームまたはマスク (ワイルドカード "*" を最初
 /devoice  <nick> [<nick>...]
           * -yes
 
-nick: ニックネームまたはマスク (ワイルドカード "*" を最初と最後につけることが可能)
-   *: チャンネル参加者全員から voice 状態を剥奪
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove voice from everybody on channel
 ----
 
 [[command_irc_die]]
@@ -209,8 +209,8 @@ target: サーバ名
 /halfop  <nick> [<nick>...]
          * -yes
 
-nick: ニックネームまたはマスク (ワイルドカード "*" を最初と最後につけることが可能)
-   *: チャンネル参加者全員に half-operator 権を付与
+nick: nick or mask (wildcard "*" is allowed)
+   *: give channel half-operator status to everybody on channel
 ----
 
 [[command_irc_ignore]]
@@ -498,8 +498,8 @@ server: 内部サーバ名 (デフォルトでは現在のサーバ)
 /op  <nick> [<nick>...]
      * -yes
 
-nick: ニックネームまたはマスク (ワイルドカード "*" を最初と最後につけることが可能)
-   *: チャンネル参加者全員にチャンネルオペレータ権を付与
+nick: nick or mask (wildcard "*" is allowed)
+   *: give channel operator status to everybody on channel
 ----
 
 [[command_irc_oper]]
@@ -838,8 +838,8 @@ server: サーバ名
 ----
 /voice  <nick> [<nick>...]
 
-nick: ニックネームまたはマスク (ワイルドカード "*" を最初と最後につけることが可能)
-   *: チャンネル参加者全員に voice 権を付与
+nick: nick or mask (wildcard "*" is allowed)
+   *: give voice to everybody on channel
 ----
 
 [[command_irc_wallchops]]
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index 6d792fa44..e61f71eaf 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -174,7 +174,7 @@
 ** 値: 未制約文字列 (デフォルト値: `"$nick"`)
 
 * [[option_irc.look.highlight_tags_restrict]] *irc.look.highlight_tags_restrict*
-** 説明: `irc バッファでハイライトを禁止するタグ (ユーザメッセージをハイライトして、サーバメッセージをハイライトしない); タグの区切り文字はコンマ、論理積を取る場合には "+" 使ってください; 1 つ以上のタグにマッチさせるには各タグの最初と最後に "*" をつけてください; 任意のタグをハイライトさせるには空値を指定してください`
+** 説明: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; wildcard "*" is allowed in tags; an empty value allows highlight on any tag`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"irc_privmsg,irc_notice"`)
 
diff --git a/doc/ja/autogen/user/trigger_commands.txt b/doc/ja/autogen/user/trigger_commands.txt
index af4ce9a0e..40fb32464 100644
--- a/doc/ja/autogen/user/trigger_commands.txt
+++ b/doc/ja/autogen/user/trigger_commands.txt
@@ -15,64 +15,64 @@
           default -yes
           monitor [<filter>]
 
-       list: トリガをリストアップ (引数なしの場合、このリストを表示します)
-   listfull: 各トリガに関する詳細な情報を付けてトリガをリストアップ
-listdefault: デフォルトトリガをリストアップ
-        add: トリガを追加
-     addoff: トリガを追加 (無効状態で)
- addreplace: 追加または存在するトリガを置換
-       name: トリガの名前
-       hook: signal、hsignal、modifier、print、command、command_run、timer、config、focus
-  arguments: フックの引数、フックの種類に依存 (セミコロンで区切る):
-             signal: シグナルの名前 (必須)
-             hsignal: hsignal の名前 (必須)
-             modifier: modifier の名前 (必須)
-             print: バッファ、タグ、メッセージ、色の削除
-             command: コマンド (必須)、説明、引数、引数の説明、補完
-             command_run: コマンド (必須)
-             timer: インターバル (必須)、秒の調節、最大呼び出し回数
-             config: オプションの名前 (必須)
-             focus: エリアの名前 (必須)
- conditions: トリガの実行条件
-      regex: 変数内の文字列を置換する 1 つ以上の正規表現
-    command: 実行するコマンド (複数のコマンドは ";" で区切ってください)
-return_code: コールバック内のリターンコード (ok (デフォルト)、ok_eat、error)
-   addinput: 入力にトリガを作る際のデフォルト引数を設定
-      input: 入力にトリガを作る際に使われるコマンドを設定
-     output: バッファでトリガを作る際のコマンドを送信
-   recreate: "add" の代わりに "addreplace" オプションを使うことを除いて "input" と同じ
-        set: トリガにオプションを設定
-     option: オプションの名前: name、hook、arguments、conditions、regex、command、return_code
-             (オプションに関するヘルプを見るには: /help trigger.trigger.<name>.<option>)
-      value: オプションの新しい値
-     rename: トリガの名前を変更
-       copy: トリガをコピー
-     enable: トリガを有効化 (引数なしの場合: 大域的にトリガを有効化)
-    disable: トリガを無効化 (引数なしの場合: 大域的にトリガを無効化)
-     toggle: トリガの有効無効を切り替え (引数なしの場合: 大域的にトリガの有効無効を切り替え)
-    restart: トリガの再開 (フックを再作成)
-       show: トリガに関する情報を表示 (状態を含めて)
-        del: トリガを削除
-       -all: 全てのトリガに関するアクションを実行
-    default: デフォルトトリガを復元
-    monitor: 任意でフィルタを付けてトリガ監視バッファを開く:
-     filter: フックおよびトリガをフィルタして表示 (フックは必ず "@" で始めてください、たとえば "@signal")、複数のフィルタをかける場合はそれぞれをコンマで区切ってください; トリガ名は最初と最後に "*" を付けることが可能です。
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
+       hook: signal, hsignal, modifier, print, command, command_run, timer, config, focus
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
+             print: buffer, tags, message, strip colors
+             command: command (required), description, arguments, description of arguments, completion
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";"
+return_code: return code in callback (ok (default), ok_eat, error)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    default: restore default triggers
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-トリガコールバックを呼び出す際には、以下の順番通りにアクションを実行します:
-  1. 条件を確認; 偽の場合、終了
-  2. POSIX 拡張正規表現を使ってテキストを置換 (トリガに定義されている場合)
-  3. コマンドを実行 (トリガに定義されている場合)
-  4. リターンコードを返して終了 (modifier と focus を除く)
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifiers and focus)
 
-例 (/trigger listdefault でデフォルトトリガを見ることができます):
-  テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*(\S+)\*==*${color:bold}$1${color:-bold}*== ==_(\S+)_==_${color:underline}$1${color:-underline}_== ==/(\S+)/==/${color:italic}$1${color:-italic}/"
-  狭い端末ではニックネームリストバーを隠す:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  設定を 1 時間毎に黙々と保存:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  トリガモニタを開き、修飾子と名前が "resize" から始まるトリガだけを表示:
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index ee266ee0e..73257d730 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -314,10 +314,10 @@ disable: disable filters
          - 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
+         - wildcard "*" is allowed
    tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
          - logical "and": use "+" between tags (for example: "nick_toto+irc_action")
-         - tags can start or end with '*'
+         - wildcard "*" is allowed
   regex: POSIX extended 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 '!')
@@ -451,44 +451,44 @@ value: 表示する履歴エントリの数
       resetall -yes [<context>]
       missing [<context>]
 
-       list: 現在のキーをリストアップ (引数無しの場合、このリストが表示されます)
-listdefault: デフォルトキーをリストアップ
-   listdiff: デフォルトと現在のキーの違いをリストアップ (追加、再定義、削除されたキー)
-    context: コンテキストの名前 ("default" または "search")
-       bind: キーにコマンドを割り当てるか、キーに割り当てられたコマンドを表示 ("default" コンテキストに対する)
-   bindctxt: キーにコマンドを割り当てるか、キーに割り当てられたコマンドを表示 (指定されたコンテキストに対する)
-    command: コマンド (複数のコマンドはセミコロンで分けて書く)
-     unbind: キーバインドを削除 ("default" コンテキストに対する)
- unbindctxt: キーバインドを削除 (指定されたコンテキストに対する)
-      reset: キーをデフォルトの割り当てにリセットする ("default" コンテキストに対する)
-  resetctxt: キーをデフォルトの割り当てにリセットする (指定されたコンテキストに対する)
-   resetall: デフォルトの割り当てにリストアし、全ての個人的な設定を削除 (注意して使用!)
-    missing: 未割り当てのキーを追加 (デフォルトの割り当てに無い)、新しい WeeChat バージョンをインストールした後に便利
+       list: list all current keys (without argument, this list is displayed)
+listdefault: list default keys
+   listdiff: list differences between current and default keys (keys added, redefined or deleted)
+    context: name of context ("default" or "search")
+       bind: bind a command to a key or display command bound to key (for context "default")
+   bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
+     unbind: remove a key binding (for context "default")
+ unbindctxt: remove a key binding for given context
+      reset: reset a key to default binding (for context "default")
+  resetctxt: reset a key to default binding, for given context
+   resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+    missing: add missing keys (using default bindings), useful after installing new WeeChat version
 
-キーにコマンドを割り当てる場合、alt+k (または Esc の後に k) した後に、割り当てたいキーを押すことをお勧めします: これはコマンドラインにキーコードを入力することになります。
+When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key code in command line.
 
-"mouse" コンテント ("cursor" コンテキストの一部) に対しては、キーは以下のフォーマット: "@area:key" または "@area1>area2:key"。 ここで、area は以下の値を取れます:
-          *: スクリーン上の任意のエリア
-       chat: チャットエリア (任意のバッファ)
-  chat(xxx): 名前 "xxx" を持つチャットエリア (プラグイン含む完全な名前)
-     bar(*): 任意のバー
-   bar(xxx): バー "xxx"
-    item(*): 任意のバーアイテム
-  item(xxx): バーアイテム "xxx"
-多くのマウスイベントにマッチさせるには '*' で開始または終了するキーを使います。
-"hsignal:name" というフォーマットのコマンドに対する特別な値はマウスコンテキストに使えます、これはフォーカスハッシュテーブルを引数にして hsignal "name" を送ります。
-その他の特別な値 "-" はキーを無効化するために利用されます。(これはキーの探索時には無視されます)
+For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be:
+          *: any area on screen
+       chat: chat area (any buffer)
+  chat(xxx): char area for buffer with name "xxx" (full name including plugin)
+     bar(*): any bar
+   bar(xxx): bar "xxx"
+    item(*): any bar item
+  item(xxx): bar item "xxx"
+Wildcard "*" is allowed in key to match many mouse events.
+A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
+Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
-例:
-  alt-x キーをニックネームリストバーに割り当てる:
+Examples:
+  key alt-x to toggle nicklist bar:
     /key bind meta-x /bar toggle nicklist
-  alt-r キーを #weechat IRC チャンネルへの移動に割り当てる:
+  key alt-r to jump to #weechat IRC channel:
     /key bind meta-r /buffer #weechat
-  alt-r キーの割り当てをデフォルトに戻す:
+  restore default binding for key alt-r:
     /key reset meta-r
-  "tab" キーをバッファ検索の終了に割り当てる:
+  key "tab" to stop search in buffer:
     /key bindctxt search ctrl-I /input search_stop
-  ニック上でのマウスのセンターボタンをニックネームの情報取得に割り当てる:
+  middle button of mouse on a nick to retrieve info on nick:
     /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick}
 ----
 
@@ -758,26 +758,26 @@ ${sec.data.xxx} の形でフォーマットされた保護データは以下の
 /set  [<option> [<value>]]
       diff [<option> [<option>...]]
 
-option: オプションの名前 (多くのオプションをリストアップするには、'*' で始めるか終わるかしてください)
- value: オプションに対する新しい値
-  diff: 変更されたオプションのみを表示
+option: name of an option (wildcard "*" is allowed)
+ value: new value for option
+  diff: display only changed options
 
-新しいオプションは以下の変数型に従います:
-  boolean: on、off、toggle
-  integer: 番号、++番号、--番号
-   string: 任意の文字列 (空文字列は "")
-    color: 色の名前、++色番号、--色番号
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-どんな型であっても、オプションの値を削除する (未定義値にする) には null が使えます。これはいくつかの特別なプラグイン変数でのみ有効です。
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-例:
-  ハイライトに関するオプションを表示:
+Examples:
+  display options about highlight:
     /set *highlight*
-  highlight に単語を追加:
+  add a word to highlight:
     /set weechat.look.highlight "word"
-  変更されたオプションを表示:
+  display changed options:
     /set diff
-  irc プラグインのオプションの内、変更されたオプションを表示
+  display changed options in irc plugin:
     /set diff irc.*
 ----
 
@@ -787,14 +787,14 @@ option: オプションの名前 (多くのオプションをリストアップ
 ----
 /unset  <option>
 
-option: オプションの名前 ("*" で始めるか終わるかすれば大量のオプションをリセットできます、注意して使用!)
+option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
 
-オプションの種類によって (一般的なオプションを) リセットまたは (サーバなどの任意な設定を) 削除が行われます。
+According to option, it's reset (for standard options) or removed (for optional settings, like server values).
 
-例:
-  オプションのリセット:
+Examples:
+  reset one option:
     /unset weechat.look.item_time_format
-  全ての色関連オプションをリセット:
+  reset all color options:
     /unset weechat.color.*
 ----
 
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index bd4579221..013deba18 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -554,7 +554,7 @@
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** 説明: `ハイライトするタグのコンマ区切りリスト; 大文字小文字の区別なし; 1 つ以上のタグにマッチさせるには各タグの最初と最後に "*" をつけてください; 論理積 "and" を取るにはタグ同士を "+" でつなげてください; 例: ニックネーム "FlashCode" からのメッセージは "nick_flashcode"、ニックネームが "toto" で始まるユーザからの notice メッセージは "irc_notice+nick_toto*"`
+** 説明: `comma separated list of tags to highlight; case insensitive comparison; wildcard "*" is allowed in each 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"`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
@@ -899,7 +899,7 @@
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** 説明: `スタートアップ時にロードするプラグインのコンマ区切りリスト、"*" は見つかった全てのプラグイン、"!" から始まる名前はロードしないプラグイン、"*" から始まるか終わるかした場合はマッチする複数のプラグイン (例: "*" または "*,!lua,!tcl")`
+** 説明: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, wildcard "*" is allowed in names (examples: "*" or "*,!lua,!tcl")`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"*"`)
 
diff --git a/doc/ja/weechat_plugin_api.ja.txt b/doc/ja/weechat_plugin_api.ja.txt
index 2012f9450..924ac4f76 100644
--- a/doc/ja/weechat_plugin_api.ja.txt
+++ b/doc/ja/weechat_plugin_api.ja.txt
@@ -808,6 +808,9 @@ length = weechat.strlen_screen("é") # 1
 
 ==== weechat_string_match
 
+// TRANSLATION MISSING
+_Updated in 0.4.4._
+
 文字列がマスクにマッチするか確認。
 
 プロトタイプ:
@@ -821,10 +824,16 @@ int weechat_string_match (const char *string, const char *mask,
 引数:
 
 * 'string': 文字列
-* 'mask': マスク、最初と最後に "`*`" をつけることができます
-  ("`*`" をマスクの内側につけることはできません)
+// TRANSLATION MISSING
+* 'mask': mask with wildcards ("*"), each wildcard matches 0 or more chars in
+  the string
 * 'case_sensitive': 大文字小文字を区別する場合は 1、区別しない場合は 0
 
+// TRANSLATION MISSING
+[NOTE]
+Since version 0.4.4, wildcards are allowed inside the mask
+(not only beginning/end of mask).
+
 戻り値:
 
 * マスクにマッチした場合は 1、それ以外は 0
@@ -833,10 +842,11 @@ C 言語での使用例:
 
 [source,C]
 ----
-int match1 = weechat_string_match ("abcdef", "abc*", 0); /* == 1 */
-int match2 = weechat_string_match ("abcdef", "*dd*", 0); /* == 0 */
-int match3 = weechat_string_match ("abcdef", "*def", 0); /* == 1 */
-int match4 = weechat_string_match ("abcdef", "*de*", 0); /* == 1 */
+int match1 = weechat_string_match ("abcdef", "abc*", 0);  /* == 1 */
+int match2 = weechat_string_match ("abcdef", "*dd*", 0);  /* == 0 */
+int match3 = weechat_string_match ("abcdef", "*def", 0);  /* == 1 */
+int match4 = weechat_string_match ("abcdef", "*de*", 0);  /* == 1 */
+int match5 = weechat_string_match ("abcdef", "*b*d*", 0); /* == 1 */
 ----
 
 スクリプト (Python) での使用例:
@@ -847,10 +857,11 @@ int match4 = weechat_string_match ("abcdef", "*de*", 0); /* == 1 */
 match = weechat.string_match(string, mask, case_sensitive)
 
 # 例s
-match1 = weechat.string_match("abcdef", "abc*", 0) # 1
-match2 = weechat.string_match("abcdef", "*dd*", 0) # 0
-match3 = weechat.string_match("abcdef", "*def", 0) # 1
-match4 = weechat.string_match("abcdef", "*de*", 0) # 1
+match1 = weechat.string_match("abcdef", "abc*", 0)  # 1
+match2 = weechat.string_match("abcdef", "*dd*", 0)  # 0
+match3 = weechat.string_match("abcdef", "*def", 0)  # 1
+match4 = weechat.string_match("abcdef", "*de*", 0)  # 1
+match5 = weechat.string_match("abcdef", "*b*d*", 0) # 1
 ----
 
 ==== weechat_string_expand_home
@@ -6832,7 +6843,8 @@ struct t_hook *weechat_hook_command_run (const char *command,
 
 引数:
 
-* 'command': フックするコマンド、ワイルドカード "*" を最初や最後につけることも可能
+// TRANSLATION MISSING
+* 'command': command to hook (wildcard "*" is allowed)
   (優先度の設定が可能、<<hook_priority,優先度>>に関する注意を参照)
 * 'callback': コマンドが実行される際に呼び出す関数、引数と戻り値:
 ** 'void *data': ポインタ
@@ -7563,9 +7575,10 @@ struct t_hook *weechat_hook_print (struct t_gui_buffer *buffer,
 
 * 'buffer': バッファへのポインタ、NULL の場合、任意のバッファからのメッセージをキャッチする
 * 'tags': このタグが付けられたメッセージだけをキャッチする (任意):
-** WeeChat バージョン 0.4.3 以上の場合: メッセージに付けられたタグのコンマ区切りリスト (論理 "or");
-   複数の条件を論理 "and" で組み合わせる場合は区切りに "+" を使ってください;
-   タグは最初と最後に "*" をつけて多くのタグにマッチさせることができます
+// TRANSLATION MISSING
+** with WeeChat ≥ 0.4.3: comma-separated list of tags that must be in message
+   (logical "or"); it is possible to combine many tags as a logical "and" with
+   separator "+"; wildcard "*" is allowed in tags
 ** WeeChat バージョン 0.4.2 以下の場合: 論理 "and"
    で組み合わせたタグのコンマ区切りリスト
 * 'message': この文字列を含むメッセージだけをキャッチする
@@ -7645,9 +7658,10 @@ struct t_hook *weechat_hook_signal (const char *signal,
 
 引数:
 
-* 'signal': キャッチするシグナル、最初と最後に "*" を使えます
-  (優先度の設定が可能、<<hook_priority,優先度>>に関する注意を参照)
-  (以下の表を参照)
+// TRANSLATION MISSING
+* 'signal': signal to catch, wildcard "*" is allowed
+  (priority allowed, see note about <<hook_priority,priority>>)
+  (see table below)
 * 'callback':
   シグナルを受信した際に呼び出す関数、引数と戻り値:
 ** 'void *data': ポインタ
@@ -8503,9 +8517,10 @@ struct t_hook *weechat_hook_hsignal (const char *signal,
 
 Arguments:
 
-* 'signal': キャッチするシグナル、最初と最後に "*" を使えます
-  (優先度の設定が可能、<<hook_priority,優先度>>に関する注意を参照)
-  (以下の表を参照)
+// TRANSLATION MISSING
+* 'signal': signal to catch, wildcard "*" is allowed
+  (priority allowed, see note about <<hook_priority,priority>>)
+  (see table below)
 * 'callback':
   シグナルを受信した際に呼び出す関数、引数と戻り値:
 ** 'void *data': ポインタ
@@ -8858,8 +8873,9 @@ struct t_hook *weechat_hook_config (const char *option,
 
 引数:
 
+// TRANSLATION MISSING
 * 'option': オプション、フォーマットは完全な名前、コマンド `/set` で使うのと同じ
-  (例: `weechat.look.item_time_format`)
+  (例: `weechat.look.item_time_format`), wildcard "*" is allowed
   (優先度の設定が可能、<<hook_priority,優先度>>に関する注意を参照)
 * 'callback':
   設定オプションが変更されたら呼び出す関数、引数と戻り値:
@@ -10770,7 +10786,8 @@ int weechat_buffer_match_list (struct t_gui_buffer *buffer, const char *string);
 * 'string': バッファのコンマ区切りリスト:
 ** "*" 任意のバッファにマッチ
 ** 名前の最初に "!" がある場合はその名前を含まない場合にマッチ
-** 名前の最初か最後に "*" がある場合は多くのバッファにマッチ
+// TRANSLATION MISSING
+** wildcard "*" is allowed in name
 
 戻り値:
 
diff --git a/doc/pl/autogen/plugin_api/infolists.txt b/doc/pl/autogen/plugin_api/infolists.txt
index bcd3ab65f..63db75f68 100644
--- a/doc/pl/autogen/plugin_api/infolists.txt
+++ b/doc/pl/autogen/plugin_api/infolists.txt
@@ -2,9 +2,9 @@
 |===
 | Wtyczka | Nazwa | Opis | Wskaźnik | Argumenty
 
-| alias | alias | lista aliasów | wskaźnik aliasu (opcjonalny) | nazwa aliasu (może się zaczynać lub kończyć "*") (opcjonalne)
+| alias | alias | lista aliasów | wskaźnik aliasu (opcjonalny) | alias name (wildcard "*" is allowed) (optional)
 
-| guile | guile_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu (może się zaczynać lub kończyć "*") (opcjonalne)
+| guile | guile_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name (wildcard "*" is allowed) (optional)
 
 | irc | irc_channel | lista kanałów IRC | wskaźnik kanału (opcjonalne) | serwer,kanał (kanał jest opcjonalny)
 
@@ -12,41 +12,41 @@
 
 | irc | irc_nick | lista nicków na kanale IRC | wskaźnik nicka (opcjonalne) | serwer,kanał,nick (kanał oraz nick są opcjonalne)
 
-| irc | irc_notify | lista powiadomień | wskaźnik powiadomienia (opcjonalne) | nazwa serwera (może się zaczynać lub kończyć "*") (opcjonalne)
+| irc | irc_notify | lista powiadomień | wskaźnik powiadomienia (opcjonalne) | server name (wildcard "*" is allowed) (optional)
 
-| irc | irc_server | lista serwerów IRC | wskaźnik serwera (opcjonalny) | nazwa serwera (może się zaczynać lub kończyć "*") (opcjonalne)
+| irc | irc_server | lista serwerów IRC | wskaźnik serwera (opcjonalny) | server name (wildcard "*" is allowed) (optional)
 
 | logger | logger_buffer | lista logowanych buforów | wskaźnik logger (opcjonalny) | -
 
-| lua | lua_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu (może się zaczynać lub kończyć "*") (opcjonalne)
+| lua | lua_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name (wildcard "*" is allowed) (optional)
 
-| perl | perl_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu (może się zaczynać lub kończyć "*") (opcjonalne)
+| perl | perl_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name (wildcard "*" is allowed) (optional)
 
-| python | python_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu (może się zaczynać lub kończyć "*") (opcjonalne)
+| python | python_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name (wildcard "*" is allowed) (optional)
 
 | relay | relay | lista zdalnych klientów | wskaźnik relay (opcjonalny) | -
 
-| ruby | ruby_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu (może się zaczynać lub kończyć "*") (opcjonalne)
+| ruby | ruby_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name (wildcard "*" is allowed) (optional)
 
-| script | script_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu z rozszerzeniem (może się zaczynać lub kończyć "*") (opcjonalne)
+| script | script_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name with extension (wildcard "*" is allowed) (optional)
 
-| tcl | tcl_script | lista skryptów | wskaźnik skryptu (opcjonalne) | nazwa skryptu (może się zaczynać lub kończyć "*") (opcjonalne)
+| tcl | tcl_script | lista skryptów | wskaźnik skryptu (opcjonalne) | script name (wildcard "*" is allowed) (optional)
 
-| weechat | bar | lista pasków | wskaźnik paska (opcjonalne) | nazwa paska (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | bar | lista pasków | wskaźnik paska (opcjonalne) | bar name (wildcard "*" is allowed) (optional)
 
-| weechat | bar_item | lista elementów pasków | wskaźnik elementu paska (opcjonalne) | nazwa elementu paska (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | bar_item | lista elementów pasków | wskaźnik elementu paska (opcjonalne) | bar item name (wildcard "*" is allowed) (optional)
 
 | weechat | bar_window | lista pasków okien | wskaźnik paska okna (opcjonalne) | -
 
-| weechat | buffer | lista buforów | wskaźnik bufora (opcjonalne) | nazwa bufora (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | buffer | lista buforów | wskaźnik bufora (opcjonalne) | buffer name (wildcard "*" is allowed) (optional)
 
 | weechat | buffer_lines | linie w buforze | wskaźnik bufora | -
 
-| weechat | filter | lista filtrów | - | nazwa filtru (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | filter | lista filtrów | - | filter name (wildcard "*" is allowed) (optional)
 
 | weechat | history | historia komend | wskaźnik bufora (jeśli nie ustawiony, zwraca globalną historię) (opcjonalne) | -
 
-| weechat | hook | lista powiązań | wskaźnik uchwytu (opcjonalne) | typ,argumenty (typ to komenda/timer/.., argumenty do uzyskania tylko niektórych hooków (mogą zaczynać się lub kończyć "*"), oba są opcjonalne)
+| weechat | hook | lista powiązań | wskaźnik uchwytu (opcjonalne) | type,arguments (type is command/timer/.., arguments to get only some hooks (wildcard "*" is allowed), both are optional)
 
 | weechat | hotlist | lista buforów w hotliście | - | -
 
@@ -56,11 +56,11 @@
 
 | weechat | nicklist | nicki na liście nicków bufora | wskaźnik bufora | nick_xxx lub group_xxx w celu pozyskania tylko nick/group xxx (opcjonalne)
 
-| weechat | option | lista opcji | - | nazwa opcji (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | option | lista opcji | - | option name (wildcard "*" is allowed) (optional)
 
-| weechat | plugin | lista wtyczek | wskaźnik wtyczki (opcjonalne) | nazwa wtyczki (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | plugin | lista wtyczek | wskaźnik wtyczki (opcjonalne) | plugin name (wildcard "*" is allowed) (optional)
 
-| weechat | proxy | lista pośredników | wskaźnik pośrednika (opcjonalny) | nazwa pośrednika (może się zaczynać lub kończyć "*") (opcjonalne)
+| weechat | proxy | lista pośredników | wskaźnik pośrednika (opcjonalny) | proxy name (wildcard "*" is allowed) (optional)
 
 | weechat | url_options | opcje dla URLi | - | -
 
diff --git a/doc/pl/autogen/user/alias_commands.txt b/doc/pl/autogen/user/alias_commands.txt
index 6279c0531..9e6373c00 100644
--- a/doc/pl/autogen/user/alias_commands.txt
+++ b/doc/pl/autogen/user/alias_commands.txt
@@ -4,31 +4,31 @@
 ----
 /alias  [-completion <dopełnienie>] <alias> [<komenda> [;<komenda>...]]
 
-completion: dopełnienie dla aliasu (opcjonalne, domyślnie dopełnienie wykonuje się z docelową komendą)
-            uwaga: można użyć %%komenda w celu użycia dopełnień dla istniejących komend
-     alias: nazwa aliasu (może się zaczynać lub kończyć "*" dla wyświetlenia listy aliasów)
-   komenda: nazwa komendy (wiele komend można oddzielić za pomocą średnika)
+completion: completion for alias (optional, by default completion is done with target command)
+            note: you can use %%command to use completion of an existing command
+     alias: name of alias (wildcard "*" is allowed)
+   command: command name with arguments (many commands can be separated by semicolons)
 
-Bez podania argumentu komenda wyświetla listę wszystkich zdefiniowanych aliasów.
+Without argument, this command lists all defined alias.
 
-Ważne: dla komend specjalne zmienne są zastępowane odpowiednimi wartościami:
-        $n: argument 'n' (pomiędzy 1 i 9)
-       $-m: argumenty od 1 do 'm'
-       $n-: argumenty od 'n' do ostatniego
-      $n-m: argumenty od 'n' od 'm'
-        $*: wszystkie argumenty
-        $~: ostatni argument
-      $var: gdzie "var" to zmienna lokalna buforu (zobacz /buffer localvar)
-            przykłady: $nick, $channel, $server, $plugin, $name
+Note: in command, special variables are replaced:
+        $n: argument 'n' (between 1 and 9)
+       $-m: arguments from 1 to 'm'
+       $n-: arguments from 'n' to last
+      $n-m: arguments from 'n' to 'm'
+        $*: all arguments
+        $~: last argument
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
+            examples: $nick, $channel, $server, $plugin, $name
 
-Do usunięcia aliasu służy komenda /unalias.
+To remove an alias, use command /unalias.
 
-Przykłady:
-  alias /split do poziomego podziału:
+Examples:
+  alias /split to split window horizontally:
     /alias split /window splith
-  alias /hello pisze "hello" na wszystkich kanałach poza #weechat:
+  alias /hello to say "hello" on all channels but not on #weechat:
     /alias hello /allchan -exclude=#weechat msg * hello
-  alias /forcejoin wysyłający komende IRC "forcejoin" z dopełnieniem dla /sajoin:
+  alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin:
     /alias -completion %%sajoin forcejoin /quote forcejoin
 ----
 
diff --git a/doc/pl/autogen/user/irc_commands.txt b/doc/pl/autogen/user/irc_commands.txt
index 67f126d23..89226b69c 100644
--- a/doc/pl/autogen/user/irc_commands.txt
+++ b/doc/pl/autogen/user/irc_commands.txt
@@ -13,18 +13,18 @@ cel: nazwa serwera
 ----
 /allchan  [-current] [-exclude=<kanał>[,<kanał>...]] <komenda> [<argumenty>]
 
- -current: wykonuje komendę tylko na kanałach obecnego serwera
- -exclude: wyklucza niektóre kanały ('*' jest dozwolone na początku lub końcu nazwy kanału, aby wykluczyć wiele kanałów)
-  komenda: komenda do wykonania
-argumenty: argumenty dla komendy (specjalne zmienne $nick, $channel i $server są zamieniane na odpowiednie wartości)
+ -current: execute command for channels of current server only
+ -exclude: exclude some channels (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-Przykłady:
-  wykonuje '/me testuje' na wszystkich kanałach:
-    /allchan me testuje
-  mówi 'witam' wszędzie tylko nie na #weechat:
-    /allchan -exclude=#weechat msg * witam
-  mówi 'witam' wszędzie poza #weechat oraz kanałami zaczynającymi się od #linux:
-    /allchan -exclude=#weechat,#linux* msg * witam
+Examples:
+  execute '/me is testing' on all channels:
+    /allchan me is testing
+  say 'hello' everywhere but not on #weechat:
+    /allchan -exclude=#weechat msg * hello
+  say 'hello' everywhere but not on #weechat and channels beginning with #linux:
+    /allchan -exclude=#weechat,#linux* msg * hello
 ----
 
 [[command_irc_allpv]]
@@ -34,7 +34,7 @@ Przykłady:
 /allpv  [-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]
 
  -current: execute command for private buffers of current server only
- -exclude: exclude some nicks ('*' is allowed at beginning or end of nick name, to exclude many nicks)
+ -exclude: exclude some nicks (wildcard "*" is allowed)
   command: command to execute
 arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
@@ -55,16 +55,16 @@ Examples:
 ----
 /allserv  [-exclude=<serwer>[,<serwer>...]] <komenda> [<argumenty>]
 
- -exclude: wyklucza niektóre serwery ('*' jest dozwolone na początku lub końcu nazwy, w celu wykluczenia wielu serwerów)
-  komenda: komenda do wykonania
-argumenty: argumenty dla komendy (specjalne zmienne $nick, $channel i $server są zamieniane na odpowiednie wartości)
+ -exclude: exclude some servers (wildcard "*" is allowed)
+  command: command to execute
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
-Przykłady:
-  zmienia nick na wszystkich serwerach:
-    /allserv nick nowy_nick
-  ustawia stan nieobecności na wszystkich serwerach:
-    /allserv away Jestem nieobecny
-  wykonuje whois na własnym nicku na wszystkich serwerach:
+Examples:
+  change nick on all servers:
+    /allserv nick newnick
+  set away on all servers:
+    /allserv away I'm away
+  do a whois on my nick on all servers:
     /allserv whois $nick
 ----
 
@@ -155,8 +155,8 @@ Examples:
 ----
 /dehalfop  <nick> [<nick>...]
 
-nick: nick lub maska (może zaczynać się lub kończyć "*")
-   *: zabiera status pół-operatora kanału wszystkim na kanale poza tobą
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove channel half-operator status from everybody on channel except yourself
 ----
 
 [[command_irc_deop]]
@@ -166,8 +166,8 @@ nick: nick lub maska (może zaczynać się lub kończyć "*")
 /deop  <nick> [<nick>...]
        * -yes
 
-nick: nick lub maska (może zaczynać się lub kończyć "*")
-   *: zabiera status operatora kanału wszystkim na kanale poza tobą
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove channel operator status from everybody on channel except yourself
 ----
 
 [[command_irc_devoice]]
@@ -177,8 +177,8 @@ nick: nick lub maska (może zaczynać się lub kończyć "*")
 /devoice  <nick> [<nick>...]
           * -yes
 
-nick: nick lub maska (może zaczynać się lub kończyć "*")
-   *: odbiera głos wszystkim na kanale
+nick: nick or mask (wildcard "*" is allowed)
+   *: remove voice from everybody on channel
 ----
 
 [[command_irc_die]]
@@ -209,8 +209,8 @@ cel: nazwa serwera
 /halfop  <nick> [<nick>...]
          * -yes
 
-nick: nick lub maska (może zaczynać się lub kończyć "*")
-   *: nadaje status pół-operatora kanału wszystkim na kanale poza tobą
+nick: nick or mask (wildcard "*" is allowed)
+   *: give channel half-operator status to everybody on channel
 ----
 
 [[command_irc_ignore]]
@@ -498,8 +498,8 @@ Przykłady:
 /op  <nick> [<nick>...]
      * -yes
 
-nick: nick lub maska (może zaczynać się lub kończyć "*")
-   *: nadaje status operatora kanału wszystkim na kanale poza tobą
+nick: nick or mask (wildcard "*" is allowed)
+   *: give channel operator status to everybody on channel
 ----
 
 [[command_irc_oper]]
@@ -837,8 +837,8 @@ serwer: nazwa serwera
 ----
 /voice  <nick> [<nick>...]
 
-nick: nick lub maska (może zaczynać się lub kończyć "*")
-   *: daje głos każdemu na kanale
+nick: nick or mask (wildcard "*" is allowed)
+   *: give voice to everybody on channel
 ----
 
 [[command_irc_wallchops]]
diff --git a/doc/pl/autogen/user/irc_options.txt b/doc/pl/autogen/user/irc_options.txt
index 7714d1ef5..56b41375b 100644
--- a/doc/pl/autogen/user/irc_options.txt
+++ b/doc/pl/autogen/user/irc_options.txt
@@ -174,7 +174,7 @@
 ** wartości: dowolny ciąg (domyślna wartość: `"$nick"`)
 
 * [[option_irc.look.highlight_tags_restrict]] *irc.look.highlight_tags_restrict*
-** opis: `ogranicza podświetlenia do tych tagów w buforach irc (żeby mieć podświetlenia tylko od wiadomości użytkowników ale nie serwera); tagi muszą być oddzielone przecinkami, "+" może zostać użyty w celu uzyskania logicznego "i" pomiędzy tagami; tag może się zaczynać i kończyć "*" żeby dopasować jeden lub więcej tagów; pusta wartość zezwala na podświetlenia przez dowolny tag`
+** opis: `restrict highlights to these tags on irc buffers (to have highlight on user messages but not server messages); tags must be separated by a comma and "+" can be used to make a logical "and" between tags; wildcard "*" is allowed in tags; an empty value allows highlight on any tag`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"irc_privmsg,irc_notice"`)
 
diff --git a/doc/pl/autogen/user/trigger_commands.txt b/doc/pl/autogen/user/trigger_commands.txt
index 553056b7b..5f3c36ac2 100644
--- a/doc/pl/autogen/user/trigger_commands.txt
+++ b/doc/pl/autogen/user/trigger_commands.txt
@@ -56,7 +56,7 @@ return_code: return code in callback (ok (default), ok_eat, error)
        -all: do action on all triggers
     default: restore default triggers
     monitor: open the trigger monitor buffer, with optional filter:
-     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; each trigger name can start or end with "*"
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
 When a trigger callback is called, following actions are performed, in this order:
   1. check conditions; if false, exit
diff --git a/doc/pl/autogen/user/weechat_commands.txt b/doc/pl/autogen/user/weechat_commands.txt
index 488aae578..944787738 100644
--- a/doc/pl/autogen/user/weechat_commands.txt
+++ b/doc/pl/autogen/user/weechat_commands.txt
@@ -314,10 +314,10 @@ disable: disable filters
          - 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
+         - wildcard "*" is allowed
    tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
          - logical "and": use "+" between tags (for example: "nick_toto+irc_action")
-         - tags can start or end with '*'
+         - wildcard "*" is allowed
   regex: POSIX extended 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 '!')
@@ -451,44 +451,44 @@ This command is used by key bindings or plugins.
       resetall -yes [<kontekst>]
       missing [<kontekst>]
 
-       list: wyświetla wszystkie obecne skróty (bez podanego argumentu, pokazywana jest ta lista)
-listdefault: wyświetla domyślne skróty klawiszowe
-   listdiff: wyświetla różnice pomiędzy obecnymi a domyślnymi skrótami klawiszowymi (dodane, przedefiniowane oraz usunięte)
-    kontekst: nazwa kontekstu ("default" lub "search")
-       bind: przypisuje komendę do klawisza lub wyświetla komendę przypisaną do klawisza
-   bindctxt: przypisuje komendę do klawiszy lub wyświetla taką komendę dla podanego kontekstu
-    komenda: komenda (wiele komend może być oddzielonych średnikiem)
-     unbind: usuwa przypisanie dla klawisza (dla kontekstu "default")
- unbindctxt: usuwa skrót klawiszowy dla podanego kontekstu
-      reset: przywraca domyślne ustawienia dla klawiszy (dla kontekstu "default")
-  resetctxt:przywraca domyślne ustawienia dla klawiszy, dla podanego kontekstu
-   resetall: przywraca przypisania do domyślnych wartości oraz kasuje WSZYSTKIE własne przypisania (używaj ostrożnie!)
-    missing: dodaje brakujące przypisania (korzystając z domyślnych wartości), przydatne po instalacji nowej wersji WeeChat
+       list: list all current keys (without argument, this list is displayed)
+listdefault: list default keys
+   listdiff: list differences between current and default keys (keys added, redefined or deleted)
+    context: name of context ("default" or "search")
+       bind: bind a command to a key or display command bound to key (for context "default")
+   bindctxt: bind a command to a key or display command bound to key, for given context
+    command: command (many commands can be separated by semicolons)
+     unbind: remove a key binding (for context "default")
+ unbindctxt: remove a key binding for given context
+      reset: reset a key to default binding (for context "default")
+  resetctxt: reset a key to default binding, for given context
+   resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+    missing: add missing keys (using default bindings), useful after installing new WeeChat version
 
-Podczas przypisania komendy do klawisza, zaleca się użycie alt+k (lub Esc następnie k), następnie wciśnięcie pożądanej kombinacji: umieści to kod klawiszowy w linii poleceń.
+When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key code in command line.
 
-Dla kontekstu "mouse" (możliwe również w kontekście "cursor"), klucz ma postać: "@obszar:klucz" lub "@obszar1>obszar2:klucz", gdzie obszar to:
-          *: dowolny obszar na ekranie
-       chat: obszar rozmowy (dowolny bufor)
-  chat(xxx): obszar rozmowy w buforze o nazwie "xxx" (pełna nazwa włączając w to wtyczkę)
-     bar(*): dowolny pasek
-   bar(xxx): pasek "xxx"
-    item(*): dowolny element paska
-  item(xxx): element paska "xxx"
-Klucz może zaczynać się, lub kończyć '*' aby dopasować wiele zdarzeń myszy.
-Specjalna wartość dla komendy o formacie "hsignal:nazwa" może być użyte dla kontekstu myszy, wyśle to hsignal "name" z aktywną hashtable jako argumentem.
-Inna specjalna wartość "-" może zostać użyta do wyłączenia klucza (zostanie on zignorowany podczas szukania kluczy).
+For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be:
+          *: any area on screen
+       chat: chat area (any buffer)
+  chat(xxx): char area for buffer with name "xxx" (full name including plugin)
+     bar(*): any bar
+   bar(xxx): bar "xxx"
+    item(*): any bar item
+  item(xxx): bar item "xxx"
+Wildcard "*" is allowed in key to match many mouse events.
+A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument.
+Another special value "-" can be used to disable key (it will be ignored when looking for keys).
 
-Przykłady:
-  kombinacja alt-x przełączająca wyświetlanie listy nicków:
+Examples:
+  key alt-x to toggle nicklist bar:
     /key bind meta-x /bar toggle nicklist
-  kombinacja alt-r przechodząca do kanału IRC #weechat IRCl:
+  key alt-r to jump to #weechat IRC channel:
     /key bind meta-r /buffer #weechat
-  przywrócenie domyślnego przypisania dla kombinacji alt-r:
+  restore default binding for key alt-r:
     /key reset meta-r
-  przycisk "tab" zatrzyma wyszukiwanie w buforze:
+  key "tab" to stop search in buffer:
     /key bindctxt search ctrl-I /input search_stop
-  środkowy przycisk myszy wciśnięty na nicku pozyska o nim informacje:
+  middle button of mouse on a nick to retrieve info on nick:
     /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick}
 ----
 
@@ -758,26 +758,26 @@ Examples:
 /set  [<opcja> [<wartość>]]
       diff [<opcja> [<opcja>...]]
 
-opcja: nazwa opcji (może zaczynać lub kończyć się "*" do wyświetlania wielu opcji)
- wartość: nowa wartość opcji
-  diff: wyświetla tylko zmienione opcje
+option: name of an option (wildcard "*" is allowed)
+ value: new value for option
+  diff: display only changed options
 
-Nowe wartości zmiennej w zależności od jej typu mają postać:
-  logiczny: on, off lub toggle
-  całkowity: liczba, ++liczba lub --liczba
-  łańcuch : dowolny ciąg ("" dla pustego ciągu)
-  kolor  : nazwa koloru, ++liczba lub --liczba
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-Dla wszystkich typów, możesz użyć null dla usunięcia wartości opcji (niezdefiniowana wartość). Działa to tylko dla niektórych specjalnych zmiennych wtyczek.
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-Przykłady:
-  wyświetla opcje dotyczące podświetleń:
+Examples:
+  display options about highlight:
     /set *highlight*
-  dodaje słowo do podświetlenia:
-    /set weechat.look.highlight "słowo"
-  wyświetla zmienione opcje:
+  add a word to highlight:
+    /set weechat.look.highlight "word"
+  display changed options:
     /set diff
-  wyświetla zmienione opcje dla wtyczki irc:
+  display changed options in irc plugin:
     /set diff irc.*
 ----
 
@@ -787,14 +787,14 @@ Przykłady:
 ----
 /unset  <opcja>
 
-opcja: nazwa opcji (może się zaczynać lub kończyć "*", w celu masowego resetowania opcji, używać ostrożnie!)
+option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
 
-W zależności od opcji, jest resetowana (dla standardowych opcji) lub usuwana (dla opcjonalnych ustawień, jak wartości dotyczące serwerów).
+According to option, it's reset (for standard options) or removed (for optional settings, like server values).
 
-Przykłady:
-  resetowanie jednej opcji:
+Examples:
+  reset one option:
     /unset weechat.look.item_time_format
-  resetowanie wszystkich opcji dotyczących kolorów:
+  reset all color options:
     /unset weechat.color.*
 ----
 
diff --git a/doc/pl/autogen/user/weechat_options.txt b/doc/pl/autogen/user/weechat_options.txt
index 1a3a48828..7e4fe32f7 100644
--- a/doc/pl/autogen/user/weechat_options.txt
+++ b/doc/pl/autogen/user/weechat_options.txt
@@ -554,7 +554,7 @@
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** opis: `oddzielona przecinkami lista tagów do podświetleń; porównywanie z uwzględnieniem wielkości znaków; każdy tag może zaczynać się lub kończyć "*", aby dopasować więcej niż jeden tag; wiele tagów może być oddzielonych "+" jako logicznym "i" pomiędzy tagami; przykłady: "nick_flashcode" dla wiadomości od nicka "FlashCode", "irc_notice+nick_toto*" dla powiadomień od nicka zaczynającego się na "toto"`
+** opis: `comma separated list of tags to highlight; case insensitive comparison; wildcard "*" is allowed in each 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: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
@@ -899,7 +899,7 @@
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** opis: `oddzielona przecinkami lista wtyczek do automatycznego załadowania podczas startu, "*" oznacza wszystkie znalezione wtyczki, nazwa zaczynająca się od "!" powoduje nie ładowanie tej wtyczki, nazwy mogą zaczynać się lub kończyć "*" w celu dopasowania kilku wtyczek (przykłady: "*" lub "*,!lua,!tcl")`
+** opis: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, wildcard "*" is allowed in names (examples: "*" or "*,!lua,!tcl")`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"*"`)
 
diff --git a/po/cs.po b/po/cs.po
index 31b4ab748..377571219 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -800,10 +800,10 @@ msgstr "výchozí hodnota"
 msgid "(unknown)"
 msgstr "(neznámý)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sVolba \"%s\" nenalezena (tip: můžete použít  \"*\" na začátku a/nebo konci "
 "volby pro zobrazení podlistu)"
@@ -1448,12 +1448,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1738,7 +1738,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2165,7 +2165,7 @@ msgstr "[<možnost> [<hodnota>]]"
 
 #, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2214,9 +2214,10 @@ msgstr "odnastavit/resetovat konfigurační možnosti"
 msgid "<option>"
 msgstr "<volba>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2877,11 +2878,11 @@ msgstr ""
 "písmena, například: \"FlashCode|flashy\""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -3565,11 +3566,12 @@ msgid ""
 "defined with command /proxy"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "čárkou rozdělený seznam pluginů pro automatické načtení při spuštění \"*\" "
 "znamená všechny nalezené pluginy, jméno začínající \"!\" je negativní "
@@ -4223,7 +4225,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4303,7 +4305,8 @@ msgstr "%s%s: chyba vytváření doplňování pro alias \"%s\": alias nenalezen
 msgid "alias pointer (optional)"
 msgstr "ukazatel aliasu (volitelné)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
 
@@ -5180,8 +5183,7 @@ msgstr "[-current] [-exclude=<kanál>[,<kanál>...]] <příkaz> [<argumenty>]"
 #, fuzzy
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5220,8 +5222,7 @@ msgstr "[-current] [-exclude=<kanál>[,<kanál>...]] <příkaz> [<argumenty>]"
 #, fuzzy
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5258,8 +5259,7 @@ msgstr "[-exclude=<server>[,<server>...]] <příkaz> [<argumenty>]"
 
 #, fuzzy
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5423,11 +5423,13 @@ msgstr "odebrat status polo-operátora kanálu z přezdívky (přezdívek)"
 msgid "<nick> [<nick>...]"
 msgstr "<přezdívka> [<přezdívka>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
 
 msgid "remove channel operator status from nick(s)"
 msgstr "odebrat status operátora kanálu z přezdívky (přezdívek)"
@@ -5436,18 +5438,20 @@ msgstr "odebrat status operátora kanálu z přezdívky (přezdívek)"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<přezdívka> [<přezdívka>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
 
 msgid "remove voice from nick(s)"
 msgstr "odebrat hlas z přezdívky (přezdívek)"
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
@@ -5476,10 +5480,12 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "dát status polo-operátora kanálu přezdívce (přezdívkám)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
+"jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
 
 msgid "ignore nicks/hosts from servers or channels"
 msgstr "ignorovat přezdívky/hosty na serveru nebo kanálu"
@@ -5895,10 +5901,12 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr "dát status operátora kanálu přezdívce (přezdívkám)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
+"jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
 
 msgid "get operator privileges"
 msgstr "dát práva operátora"
@@ -6288,7 +6296,7 @@ msgstr "dá hlas přezdívce/přezdívkám"
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "jméno aliasu (může začínat nebo končit \"*\" jako zástupný znak) (volitelné)"
@@ -6791,9 +6799,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 msgid "display server away message in away bar item"
@@ -7271,7 +7278,8 @@ msgstr "seznam IRC serverů"
 msgid "server pointer (optional)"
 msgstr "ukayatel serveru (volitelný)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno serveru (může začínat nebo končit s \"*\" jako zástupný znakem) "
 "(volitelné)"
@@ -8385,7 +8393,8 @@ msgstr "seznam polí"
 msgid "bar pointer (optional)"
 msgstr "ukazatel pole (volitelný)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno pole (může začínat nebo končit \"*\" jako zástupným znakem) (volitelné)"
 
@@ -8395,7 +8404,8 @@ msgstr "seznam položek polí"
 msgid "bar item pointer (optional)"
 msgstr "ukazatel položky pole (volitelný)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno položky pole (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -8412,7 +8422,8 @@ msgstr "seznam bufferů"
 msgid "buffer pointer (optional)"
 msgstr "ukazatel bufferu (volitelný)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno buferu (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -8426,7 +8437,8 @@ msgstr "ukazatel bufferu"
 msgid "list of filters"
 msgstr "seznam filtrů"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno filtru (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -8446,9 +8458,10 @@ msgstr "seznam napojení"
 msgid "hook pointer (optional)"
 msgstr "ukazatel přezdívky (volitelné)"
 
+#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "typ,argumenty (typ je příkaz/časovač/..., argumenty pro získání jen "
 "některých napojení (může začínat nebo končit na \"*\"), oba jsou nepovinné)"
@@ -8476,7 +8489,8 @@ msgstr ""
 msgid "list of options"
 msgstr "seznam konfiguračních možností"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno volby (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -8487,7 +8501,8 @@ msgstr "seznam pluginů"
 msgid "plugin pointer (optional)"
 msgstr "ukazatel pluginu (volitelný)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno pluginu (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -8501,7 +8516,7 @@ msgid "proxy pointer (optional)"
 msgstr "ukazatel přesměrování (volitelné)"
 
 #, fuzzy
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno pole (může začínat nebo končit \"*\" jako zástupným znakem) (volitelné)"
 
@@ -8727,7 +8742,8 @@ msgstr "seznam skriptů"
 msgid "script pointer (optional)"
 msgstr "ukazatel skriptu (volitelný)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno skriptu (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -9752,9 +9768,7 @@ msgid "URL for file with list of scripts"
 msgstr "seznam skriptů"
 
 #, fuzzy
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "jméno skriptu (může začínat nebo končit \"*\" jako zástupným znakem) "
 "(volitelné)"
@@ -10048,8 +10062,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/de.po b/po/de.po
index 331f33caa..e2ab29f5d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 21:06+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -813,10 +813,10 @@ msgstr "Standardwert: "
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sOption \"%s\" nicht gefunden (Tipp: Der Platzhalter \"*\" kann zu Beginn "
 "und/oder am Ende genutzt werden um Gruppen von Optionen anzusprechen)"
@@ -1587,12 +1587,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1888,6 +1888,7 @@ msgstr ""
 "<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
 "[<context>] || missing [<context>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1923,7 +1924,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2513,8 +2514,9 @@ msgstr "Konfigurationsparameter setzen"
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<option> [<value>]] || diff [<option> [<option>...]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2569,9 +2571,10 @@ msgstr "Konfigurationsparameter freigeben/zurücksetzen"
 msgid "<option>"
 msgstr "<option>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -3364,12 +3367,13 @@ msgstr ""
 "Kleinschreibung zu unterscheiden muss am Wortanfang \"(?-i)\" genutzt "
 "werden). Beispiele: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
 
+#, fuzzy
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
 "eine durch Kommata getrennte Liste von Tags, die eine highlight-Nachricht "
 "erzeugen; Groß- und Kleinschreibung wird dabei nicht beachtet; Tags können "
@@ -4184,11 +4188,12 @@ msgstr ""
 "herunterzuladen oder in Skripten, welche die Funktion hook_process nutzen); "
 "der Proxy muss mit dem Befehl /proxy eingerichtet werden"
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "durch Kommata getrennte Liste der Erweiterungen, die beim Programmstart "
 "automatisch geladen werden sollen; \"*\" lädt alle vorhandenen "
@@ -4897,13 +4902,13 @@ msgstr "Einem Befehl wird ein Alias zugewiesen"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <completion>] <alias> [<command> [;<command>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4990,7 +4995,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "Alias Pointer (optional)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Alias Name (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -6019,10 +6025,10 @@ msgstr ""
 msgid "[-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]"
 msgstr "[-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]"
 
+#, fuzzy
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -6063,10 +6069,10 @@ msgstr ""
 msgid "[-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]"
 msgstr "[-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]"
 
+#, fuzzy
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -6107,9 +6113,9 @@ msgstr "führt einen Befehl aus, der zu allen verbundenen Server gesendet wird"
 msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 
+#, fuzzy
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -6286,8 +6292,9 @@ msgstr "halb-Operator-Privilegien einem oder mehreren Nick(s) entziehen"
 msgid "<nick> [<nick>...]"
 msgstr "<nick> [<nick>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -6302,8 +6309,9 @@ msgstr "Operator-Privilegien einem oder mehreren Nicknamen entziehen"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<nick> [<nick>...] || * -yes"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -6315,8 +6323,9 @@ msgstr ""
 msgid "remove voice from nick(s)"
 msgstr "Voice-Privilegien einem oder mehreren Nicknamen entziehen"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "nick: Nick oder Maske (darf mit einem \"*\" als Platzhalter beginnen oder "
@@ -6347,8 +6356,9 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "halb-Operator Status an Nick(s) vergeben"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 "nick: Nick oder Maske (darf mit einem \"*\" als Platzhalter beginnen oder "
@@ -6776,8 +6786,9 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr "Channel-Operator Status an Nicknamen vergeben"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 "nick: Nick oder Maske (darf mit einem \"*\" als Platzhalter beginnen oder "
@@ -7172,8 +7183,9 @@ msgstr ""
 msgid "give voice to nick(s)"
 msgstr "Voice an Nick(s) vergeben"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "nick: Nick oder Maske (darf mit einem \"*\" als Platzhalter beginnen oder "
@@ -7782,12 +7794,12 @@ msgstr ""
 "schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein "
 "Highlight für den Nick. Beispiel: \"$nick\", \"(?-i)$nick\""
 
+#, fuzzy
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 "beschränkt Highlights für IRC Buffer auf bestimmte Tags (um Highlights durch "
 "User- aber nicht durch Servernachrichten zu erhalten); Tags müssen durch "
@@ -8371,7 +8383,8 @@ msgstr "Liste der IRC-Server"
 msgid "server pointer (optional)"
 msgstr "Server Pointer (optional)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Servername (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9507,7 +9520,8 @@ msgstr "Auflistung der Bars"
 msgid "bar pointer (optional)"
 msgstr "Bar Pointer (optional)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Bar Name (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9518,7 +9532,8 @@ msgstr "Auflistung der Bar-Items"
 msgid "bar item pointer (optional)"
 msgstr "Bar Item Pointer (optional)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Bar-Item Name (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9535,7 +9550,8 @@ msgstr "Auflistung der Buffer"
 msgid "buffer pointer (optional)"
 msgstr "Buffer Pointer (optional)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name des Buffers (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9549,7 +9565,8 @@ msgstr "Buffer Pointer"
 msgid "list of filters"
 msgstr "Auflistung der Filter"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name des Filters (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9568,9 +9585,10 @@ msgstr "Auflistung der Hooks"
 msgid "hook pointer (optional)"
 msgstr "Hook-Pointer (optional)"
 
+#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "type,arguments (type ist ein command/timer/.., arguments dient dazu nur "
 "einige hooks abzufragen (darf mit einem \"*\" als Platzhalter beginnen oder "
@@ -9599,7 +9617,8 @@ msgstr ""
 msgid "list of options"
 msgstr "Auflistung der Optionen"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name einer Option (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9610,7 +9629,8 @@ msgstr "Auflistung der Erweiterungen"
 msgid "plugin pointer (optional)"
 msgstr "Pointer der Erweiterung (optional)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name einer Erweiterung (darf mit einem \"*\" als Platzhalter beginnen oder "
 "enden) (optional)"
@@ -9621,7 +9641,8 @@ msgstr "Liste der Proxys"
 msgid "proxy pointer (optional)"
 msgstr "Proxy Pointer (optional)"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name des Proxy (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -9840,7 +9861,8 @@ msgstr "Liste der Skripten"
 msgid "script pointer (optional)"
 msgstr "Skript Pointer (optional)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name des Skriptes (darf mit einem \"*\" als Platzhalter beginnen oder enden) "
 "(optional)"
@@ -11031,9 +11053,8 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "URL für Datei mit Inhalt der unterstützten Skripten"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+#, fuzzy
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "Name des Skriptes, mit Dateierweiterung (darf mit einem \"*\" als "
 "Platzhalter beginnen oder enden) (optional)"
@@ -11279,6 +11300,7 @@ msgstr ""
 "[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
 "monitor [<filter>]"
 
+#, fuzzy
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -11332,8 +11354,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/es.po b/po/es.po
index 1b66bab62..190efbc01 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -805,10 +805,10 @@ msgstr "predeterminado: "
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sOpción \"%s\" no encontrada (puedes usar \"*\" al principio y/o al final "
 "de la opción para ver un listado)"
@@ -1486,12 +1486,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1757,6 +1757,7 @@ msgstr ""
 "resetctxt <contexto> <tecla> || resetall -yes [<contexto>] || missing "
 "[<contexto>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1792,7 +1793,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2273,8 +2274,9 @@ msgstr "establecer opciones de configuración"
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opción> [<valor>]] || diff [<opción> [<opción>...]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2327,9 +2329,10 @@ msgstr "deshacer/reiniciar opciones de configuración"
 msgid "<option>"
 msgstr "<opción>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -3035,11 +3038,11 @@ msgstr ""
 "\"FlashCode|flashy\", \"(?-i)Flascode|flashy\""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -3770,11 +3773,12 @@ msgid ""
 "defined with command /proxy"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "lista de plugins separados por comas para cargar automáticamente al iniciar, "
 "\"*\" significa todos los plugins encontrados, un nombre empezando con \"!\" "
@@ -4427,7 +4431,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4511,7 +4515,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "puntero del alias (opcional)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
@@ -5394,8 +5399,7 @@ msgstr "[-current] [-exclude=<canal>[,<canal>...]] <comando> [<argumentos>]"
 #, fuzzy
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5436,8 +5440,7 @@ msgstr "[-current] [-exclude=<canal>[,<canal>...]] <comando> [<argumentos>]"
 #, fuzzy
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5475,8 +5478,7 @@ msgstr "[-exclude=<servidor>[,<servidor>...]] <comando> [<argumentos>]"
 
 #, fuzzy
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5648,11 +5650,13 @@ msgstr "remueve el estado de semi-operador del canal de el/los apodo(s)"
 msgid "<nick> [<nick>...]"
 msgstr "<apodo> [<apodo>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
 msgid "remove channel operator status from nick(s)"
 msgstr "remueve el estado de operador del canal de el/los apodo(s)"
@@ -5661,18 +5665,20 @@ msgstr "remueve el estado de operador del canal de el/los apodo(s)"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<apodo> [<apodo>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
 msgid "remove voice from nick(s)"
 msgstr "remueve voz de el/los apodo(s)"
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
@@ -5702,10 +5708,12 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "dar el estado de semi-operador del canal a el/los apodo(s)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
+"nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
 msgid "ignore nicks/hosts from servers or channels"
 msgstr "ignorar apodos/hosts en servidores o canales"
@@ -6124,10 +6132,12 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr "dar el estado de operador del canal a el/los apodo(s)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
+"nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
 msgid "get operator privileges"
 msgstr "obtener privilegios de operador"
@@ -6520,7 +6530,7 @@ msgstr "da voz a el/los apodo(s)"
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
@@ -7058,9 +7068,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 msgid "display server away message in away bar item"
@@ -7561,7 +7570,8 @@ msgstr "lista de servidores IRC"
 msgid "server pointer (optional)"
 msgstr "puntero del servidor (opcional)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del servidor (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -8674,7 +8684,8 @@ msgstr "lista de barras"
 msgid "bar pointer (optional)"
 msgstr "puntero de la barra (opcional)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre de barra (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
@@ -8684,7 +8695,8 @@ msgstr "lista de elementos de barra"
 msgid "bar item pointer (optional)"
 msgstr "puntero del elemento de barra (opcional)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del elemento de barra (puede empezar o terminar con \"*\" como "
 "comodín) (opcional)"
@@ -8701,7 +8713,8 @@ msgstr "lista de buffers"
 msgid "buffer pointer (optional)"
 msgstr "puntero del buffer (opcional)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del buffer (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -8715,7 +8728,8 @@ msgstr "puntero del buffer"
 msgid "list of filters"
 msgstr "lista de filtros"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del filtro (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -8735,9 +8749,10 @@ msgid "hook pointer (optional)"
 msgstr "puntero del apodo (opcional)"
 
 # translate command,timer?
+#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "tipo,argumentos (tipo es command/timer/.., argumentos para obtener solo "
 "algunos enganches (puede empezar o terminar con \"*\" como comodín) ambos "
@@ -8765,7 +8780,8 @@ msgstr "nick_xxx o group_xxx para obtener solo el apodo/grupo xxx (opcional)"
 msgid "list of options"
 msgstr "lista de opciones"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre de la opción (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -8776,7 +8792,8 @@ msgstr "lista de plugins"
 msgid "plugin pointer (optional)"
 msgstr "puntero del plugin (opcional)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del plugin (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -8790,7 +8807,7 @@ msgid "proxy pointer (optional)"
 msgstr "puntero del retransmisor (opcional)"
 
 #, fuzzy
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre de barra (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
@@ -9003,7 +9020,8 @@ msgstr "lista de scripts"
 msgid "script pointer (optional)"
 msgstr "puntero del script (opcional)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del script (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -10024,9 +10042,8 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "URL del archivo con la lista de scripts"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+#, fuzzy
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nombre del script con extensión (puede empezar o terminar con \"*\" como "
 "comodín) (opcional)"
@@ -10318,8 +10335,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/fr.po b/po/fr.po
index c770d6a4b..053a8b11b 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: 2014-04-12 17:30+0200\n"
-"PO-Revision-Date: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
+"PO-Revision-Date: 2014-04-12 22:57+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -804,11 +804,11 @@ msgstr "(inconnu)"
 
 #, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
-"%sOption \"%s\" non trouvée (astuce: vous pouvez utiliser \"*\" au début et/"
-"ou à la fin de l'option pour voir une sous-liste)"
+"%sOption \"%s\" non trouvée (astuce: vous pouvez utiliser le caractère joker "
+"\"*\" dans l'option pour voir une sous-liste)"
 
 msgid "No option found"
 msgstr "Aucune option trouvée"
@@ -1565,12 +1565,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1627,13 +1627,12 @@ msgstr ""
 "freenode.#weechat\")\n"
 "            - \"*\" signifie tous les tampons\n"
 "            - un nom commençant par '!' est exclu\n"
-"            - le nom peut commencer ou se terminer par '*' pour plusieurs "
-"tampons\n"
+"            - le caractère joker \"*\" est autorisé\n"
 "étiquettes: liste d'étiquettes, séparées par des virgules, par exemple: "
 "\"irc_join,irc_part,irc_quit\"\n"
 "            - \"et\" logique: utilisez \"+\" entre les étiquettes (par "
 "exemple: \"nick_toto+irc_action\")\n"
-"            - les étiquettes peuvent commencer ou se terminer par '*'\n"
+"            - le caractère joker \"*\" est autorisé\n"
 "     regex: expression régulière POSIX étendue à 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"
@@ -1884,7 +1883,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -1941,8 +1940,8 @@ msgstr ""
 "   bar(xxx): la barre \"xxx\"\n"
 "    item(*): n'importe quel objet de barre\n"
 "  item(xxx): l'objet de barre \"xxx\"\n"
-"La touche peut commencer ou se terminer par '*' pour plusieurs évènements de "
-"la souris.\n"
+"La caractère joker \"*\" est autorisé pour plusieurs évènements de la "
+"souris.\n"
 "Une valeur spéciale pour la commande avec le format \"hsignal:nom\" peut "
 "être utilisée dans le contexte \"mouse\", cela enverra le signal \"nom\" "
 "avec la table de hachage du focus comme paramètre.\n"
@@ -2455,7 +2454,7 @@ msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<option> [<valeur>]] || diff [<option> [<option>...]]"
 
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2478,8 +2477,7 @@ msgid ""
 "  display changed options in irc plugin:\n"
 "    /set diff irc.*"
 msgstr ""
-"option: nom d'une option (peut démarrer ou se terminer par '*' pour lister "
-"plusieurs options)\n"
+"option: nom d'une option (le caractère joker \"*\" est autorisé)\n"
 "valeur: nouvelle valeur pour l'option\n"
 "  diff: afficher seulement les options modifiées\n"
 "\n"
@@ -2510,8 +2508,8 @@ msgid "<option>"
 msgstr "<option>"
 
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2522,7 +2520,7 @@ msgid ""
 "  reset all color options:\n"
 "    /unset weechat.color.*"
 msgstr ""
-"option: nom d'une option (peut commencer ou se terminer par \"*\" pour "
+"option: nom d'une option (le caractère joker \"*\" est autorisé pour "
 "réinitialiser plusieurs options, à utiliser avec prudence !)\n"
 "\n"
 "Selon l'option, elle est réinitialisée (pour les options standards) ou "
@@ -3272,19 +3270,18 @@ msgstr ""
 "\"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 étiquettes pour le highlight (séparées par des virgules); la "
-"comparaison ne tient pas compte de la casse; chaque étiquette peut commencer "
-"ou se terminer par \"*\" pour correspondre à plus d'une étiquette; plusieurs "
-"étiquettes peuvent être séparées par \"+\" pour faire un \"et\" logique "
-"entre les étiquettes; exemples: \"nick_flashcode\" pour les messages du "
-"pseudo \"FlashCode\", \"irc_notice+nick_toto*\" pour les notices d'un pseudo "
-"commençant par \"toto\""
+"comparaison ne tient pas compte de la casse; le caractère joker \"*\" est "
+"autorisé dans chaque étiquette; plusieurs étiquettes peuvent être séparées "
+"par \"+\" pour faire un \"et\" logique entre les étiquettes; exemples: "
+"\"nick_flashcode\" pour les messages du pseudo \"FlashCode\", \"irc_notice"
+"+nick_toto*\" pour les notices d'un pseudo commençant par \"toto\""
 
 msgid ""
 "conditions to add a buffer in hotlist (if notify level is OK for the "
@@ -4076,14 +4073,14 @@ msgstr ""
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "liste des extensions à charger automatiquement au démarrage (séparées par "
 "des virgules), \"*\" signifie toutes les extensions trouvées, un nom "
 "commençant par \"!\" est une valeur négative pour empêcher une extension "
-"d'être chargée, les noms peuvent commencer ou se terminer par \"*\" pour "
-"indiquer plusieurs extensions (exemples: \"*\" ou \"*,!lua,!tcl\")"
+"d'être chargée, le caractère joker \"*\" est autorisé dans les noms "
+"(exemples: \"*\" ou \"*,!lua,!tcl\")"
 
 msgid ""
 "enable debug messages by default in all plugins (option disabled by default, "
@@ -4787,7 +4784,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4819,8 +4816,7 @@ msgstr ""
 "fait avec la commande cible)\n"
 "            note: vous pouvez utiliser %%commande pour utiliser la "
 "complétion d'une commande existante\n"
-"     alias: nom de l'alias (peut démarrer ou se terminer par \"*\" pour une "
-"liste d'alias)\n"
+"     alias: nom de l'alias (le caractère joker \"*\" est autorisé)\n"
 "  commande: nom de la commande avec les paramètres (plusieurs commandes "
 "peuvent être séparées par des points-virgules)\n"
 "\n"
@@ -4873,9 +4869,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "pointeur vers l'alias (optionnel)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom d'alias (peut démarrer ou se terminer par \"*\" comme joker) (optionnel)"
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom d'alias (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "Spell checker for input (with Aspell)"
 msgstr "Vérificateur d'orthographe pour la saisie (avec Aspell)"
@@ -5874,8 +5869,7 @@ msgstr "[-current] [-exclude=<canal>[,<canal>...]] <commande> [<paramètres>]"
 
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5891,8 +5885,7 @@ msgid ""
 msgstr ""
 "  -current: exécuter la commande pour les canaux du serveur courant "
 "seulement\n"
-"  -exclude: exclure certains canaux ('*' est autorisé au début ou à la fin "
-"du nom du canal, pour exclure plusieurs canaux)\n"
+"  -exclude: exclure certains canaux (le caractère joker \"*\" est autorisé)\n"
 "  commande: commande à exécuter\n"
 "paramètres: paramètres pour la commande (les variables spéciales $nick, "
 "$channel et $server sont remplacées par leur valeur)\n"
@@ -5916,8 +5909,7 @@ msgstr "[-current] [-exclude=<pseudo>[,<pseudo>...]] <commande> [<paramètres>]"
 
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5934,8 +5926,8 @@ msgid ""
 msgstr ""
 "  -current: exécuter la commande pour les tampons privés du serveur courant "
 "seulement\n"
-"  -exclude: exclure certains pseudos ('*' est autorisé au début ou à la fin "
-"du pseudo, pour exclure plusieurs pseudos)\n"
+"  -exclude: exclure certains pseudos (le caractère joker \"*\" est "
+"autorisé)\n"
 "  commande: commande à exécuter\n"
 "paramètres: paramètres pour la commande (les variables spéciales $nick, "
 "$channel et $server sont remplacées par leur valeur)\n"
@@ -5958,8 +5950,7 @@ msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr "[-exclude=<serveur>[,<serveur>...]] <commande> [<paramètres>]"
 
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5972,8 +5963,8 @@ msgid ""
 "  do a whois on my nick on all servers:\n"
 "    /allserv whois $nick"
 msgstr ""
-"  -exclude: exclude certains serveurs ('*' est autorisé en début ou fin du "
-"nom du serveur, pour exclure plusieurs serveurs)\n"
+"  -exclude: exclude certains serveurs (le caractère joker \"*\" est "
+"autorisé)\n"
 "  commande: commande à exécuter\n"
 "paramètres: paramètres pour la commande (les variables spéciales $nick, "
 "$channel et $server sont remplacées par leur valeur)\n"
@@ -6132,12 +6123,11 @@ msgid "<nick> [<nick>...]"
 msgstr "<pseudo> [<pseudo>...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
-"pseudo: pseudo ou masque (peut démarrer ou se terminer par \"*\" comme "
-"joker)\n"
+"pseudo: pseudo ou masque (le caractère joker \"*\" est autorisé)\n"
 "     *: retirer le statut de demi-opérateur de tout le monde sur le canal "
 "excepté vous-même"
 
@@ -6148,12 +6138,11 @@ msgid "<nick> [<nick>...] || * -yes"
 msgstr "<pseudo> [<pseudo>...] || * -yes"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
-"pseudo: pseudo ou masque (peut démarrer ou se terminer par \"*\" comme "
-"joker)\n"
+"pseudo: pseudo ou masque (le caractère joker \"*\" est autorisé)\n"
 "     *: retirer le statut d'opérateur de tout le monde sur le canal excepté "
 "vous-même"
 
@@ -6161,11 +6150,10 @@ msgid "remove voice from nick(s)"
 msgstr "retirer la voix du/des pseudo(s)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
-"pseudo: pseudo ou masque (peut démarrer ou se terminer par \"*\" comme "
-"joker)\n"
+"pseudo: pseudo ou masque (le caractère joker \"*\" est autorisé)\n"
 "     *: retirer la voix de tout le monde sur le canal"
 
 msgid "shutdown the server"
@@ -6193,11 +6181,10 @@ msgid "give channel half-operator status to nick(s)"
 msgstr "donner le statut de demi-opérateur à un/des pseudo(s)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
-"pseudo: pseudo ou masque (peut démarrer ou se terminer par \"*\" comme "
-"joker)\n"
+"pseudo: pseudo ou masque (le caractère joker \"*\" est autorisé)\n"
 "     *: donner le statut de demi-opérateur à tout le monde sur le canal"
 
 msgid "ignore nicks/hosts from servers or channels"
@@ -6618,11 +6605,10 @@ msgid "give channel operator status to nick(s)"
 msgstr "donner le statut d'opérateur à un/des pseudo(s)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
-"pseudo: pseudo ou masque (peut démarrer ou se terminer par \"*\" comme "
-"joker)\n"
+"pseudo: pseudo ou masque (le caractère joker \"*\" est autorisé)\n"
 "     *: donner le statut d'opérateur à tout le monde sur le canal"
 
 msgid "get operator privileges"
@@ -7007,11 +6993,10 @@ msgid "give voice to nick(s)"
 msgstr "donner la voix à/aux pseudo(s)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
-"pseudo: pseudo ou masque (peut démarrer ou se terminer par \"*\" comme "
-"joker)\n"
+"pseudo: pseudo ou masque (le caractère joker \"*\" est autorisé)\n"
 "     *: donner la voix à tout le monde sur le canal"
 
 msgid "send a notice to channel ops"
@@ -7590,17 +7575,15 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 "restreindre les highlights à ces étiquettes sur les tampons irc (pour avoir "
 "un highlight seulement sur les messages utilisateur et pas les messages du "
 "serveur); les étiquettes doivent être séparées par des virgules et \"+\" "
-"peut être utilisé pour faire un \"et\" logique entre étiquettes; les "
-"étiquettes peuvent commencer ou se terminer par \"*\" pour correspondre à "
-"plus d'une étiquette; une valeur vide autorise le highlight sur n'importe "
-"quelle étiquette"
+"peut être utilisé pour faire un \"et\" logique entre étiquettes; le "
+"caractère joker \"*\" est autorisé dans les étiquettes; une valeur vide "
+"autorise le highlight sur n'importe quelle étiquette"
 
 msgid "display server away message in away bar item"
 msgstr ""
@@ -8142,10 +8125,8 @@ msgstr "liste des serveurs IRC"
 msgid "server pointer (optional)"
 msgstr "pointeur vers le serveur (optionnel)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom de serveur (peut démarrer ou se terminer par \"*\" comme joker) "
-"(optionnel)"
+msgid "server name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom de serveur (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "list of channels for an IRC server"
 msgstr "liste des canaux pour un serveur IRC"
@@ -9255,9 +9236,8 @@ msgstr "liste des barres"
 msgid "bar pointer (optional)"
 msgstr "pointeur vers la barre (optionnel)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom de barre (peut démarrer ou se terminer par \"*\" comme joker) (optionnel)"
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom de barre (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "list of bar items"
 msgstr "liste des objets de barres"
@@ -9265,10 +9245,9 @@ msgstr "liste des objets de barres"
 msgid "bar item pointer (optional)"
 msgstr "pointeur vers l'objet de barre (optionnel)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
-"nom d'objet de barre (peut démarrer ou se terminer par \"*\" comme joker) "
-"(optionnel)"
+"nom d'objet de barre (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "list of bar windows"
 msgstr "liste des fenêtres de barre"
@@ -9282,10 +9261,8 @@ msgstr "liste des tampons"
 msgid "buffer pointer (optional)"
 msgstr "pointeur vers le tampon (optionnel)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom de tampon (peut démarrer ou se terminer par \"*\" comme joker) "
-"(optionnel)"
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom de tampon (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "lines of a buffer"
 msgstr "lignes d'un tampon"
@@ -9296,10 +9273,8 @@ msgstr "pointeur vers le tampon"
 msgid "list of filters"
 msgstr "liste des filtres"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom de filtre (peut démarrer ou se terminer par \"*\" comme joker) "
-"(optionnel)"
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom de filtre (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "history of commands"
 msgstr "historique des commandes"
@@ -9317,11 +9292,11 @@ msgstr "pointeur vers le hook (optionnel)"
 
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "type,paramètres (le type est command/timer/.., paramètres pour avoir "
-"seulement quelques hooks (peut démarrer ou se terminer par \"*\" comme "
-"joker), les deux sont optionnels)"
+"seulement quelques hooks (le caractère joker \"*\" est autorisé), les deux "
+"sont optionnels)"
 
 msgid "list of buffers in hotlist"
 msgstr "liste des tampons dans la hotlist"
@@ -9346,9 +9321,8 @@ msgstr ""
 msgid "list of options"
 msgstr "liste des options"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom d'option (peut démarrer ou se terminer par \"*\" comme joker) (optionnel)"
+msgid "option name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom d'option (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "list of plugins"
 msgstr "liste des extensions"
@@ -9356,10 +9330,8 @@ msgstr "liste des extensions"
 msgid "plugin pointer (optional)"
 msgstr "pointeur vers l'extension (optionnel)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom d'extension (peut démarrer ou se terminer par \"*\" comme joker) "
-"(optionnel)"
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom d'extension (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "list of proxies"
 msgstr "liste des proxies"
@@ -9367,9 +9339,8 @@ msgstr "liste des proxies"
 msgid "proxy pointer (optional)"
 msgstr "pointeur vers le proxy (optionnel)"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom de proxy (peut démarrer ou se terminer par \"*\" comme joker) (optionnel)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom de proxy (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "options for URL"
 msgstr "options pour l'URL"
@@ -9582,10 +9553,8 @@ msgstr "liste des scripts"
 msgid "script pointer (optional)"
 msgstr "pointeur vers le script (optionnel)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
-msgstr ""
-"nom de script (peut démarrer ou se terminer par \"*\" comme joker) "
-"(optionnel)"
+msgid "script name (wildcard \"*\" is allowed) (optional)"
+msgstr "nom de script (le caractère joker \"*\" est autorisé) (optionnel)"
 
 msgid "callback of a script"
 msgstr "callback d'un script"
@@ -10757,12 +10726,10 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "URL pour le fichier avec la liste des scripts"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
-"nom du script avec extension (peut démarrer ou se terminer par \"*\" comme "
-"joker) (optionnel)"
+"nom du script avec extension (le caractère joker \"*\" est autorisé) "
+"(optionnel)"
 
 msgid "scripts from repository"
 msgstr "scripts du dépôt"
@@ -11057,8 +11024,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
@@ -11145,8 +11112,8 @@ msgstr ""
 "    monitor: ouvrir le tampon moniteur des triggers\n"
 "     filtre: filtrer les hooks/triggers à afficher (un hook doit commencer "
 "par \"@\", par exemple \"@signal\"), plusieurs filtres peuvent être séparés "
-"par des virgules; chaque nom de trigger peut commencer ou se terminer par \"*"
-"\"\n"
+"par des virgules; le caractère joker \"*\" est autorisé dans chaque nom de "
+"trigger\n"
 "\n"
 "Lorsqu'un callback de trigger est appelé, les actions suivantes sont "
 "exécutées, dans cet ordre :\n"
diff --git a/po/hu.po b/po/hu.po
index a3dac68cb..2b1dbef24 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -838,8 +838,8 @@ msgstr "(ismeretlen)"
 
 #, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 
 #, fuzzy
@@ -1375,12 +1375,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1567,7 +1567,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -1912,7 +1912,7 @@ msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[opció [ = érték]]"
 
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -1945,8 +1945,8 @@ msgid "<option>"
 msgstr "[parancs]"
 
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2519,11 +2519,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -3198,8 +3198,8 @@ msgstr ""
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "automatikusan betöltendő modulok vesszővel elválasztott listája, \"*\" "
 "esetén az összes fellelt modul (az elnevezés lehet részleges, például a "
@@ -3849,7 +3849,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -3916,7 +3916,7 @@ msgstr "%s a \"%s\" opció nem található\n"
 msgid "alias pointer (optional)"
 msgstr "konfigurációs paraméterek beállítása"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "Spell checker for input (with Aspell)"
@@ -4761,8 +4761,7 @@ msgstr "[alias_név [parancs [paraméterek]]]"
 
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4787,8 +4786,7 @@ msgstr "[alias_név [parancs [paraméterek]]]"
 
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4812,8 +4810,7 @@ msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr ""
 
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4960,7 +4957,7 @@ msgid "<nick> [<nick>...]"
 msgstr "név [név...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -4974,7 +4971,7 @@ msgid "<nick> [<nick>...] || * -yes"
 msgstr "név [név...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -4984,7 +4981,7 @@ msgid "remove voice from nick(s)"
 msgstr "elveszi a voice jogot a felhasználó(k)tól"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 
@@ -5016,7 +5013,7 @@ msgid "give channel half-operator status to nick(s)"
 msgstr "operátori jogok biztosítása felhasználó(k)nak"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 
@@ -5374,7 +5371,7 @@ msgid "give channel operator status to nick(s)"
 msgstr "operátori jogok biztosítása felhasználó(k)nak"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 
@@ -5798,7 +5795,7 @@ msgid "give voice to nick(s)"
 msgstr "voice jog biztosítása a felhasználó(k)nak"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 
@@ -6295,9 +6292,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 #, fuzzy
@@ -6744,7 +6740,7 @@ msgstr "IRC szerver portja"
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7810,7 +7806,7 @@ msgstr "Aliaszok listája:\n"
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7820,7 +7816,7 @@ msgstr "Aliaszok listája:\n"
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7837,7 +7833,7 @@ msgstr "Aliaszok listája:\n"
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7852,7 +7848,7 @@ msgstr "szöveg keresése a puffertörténetben"
 msgid "list of filters"
 msgstr "Aliaszok listája:\n"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7872,7 +7868,7 @@ msgstr "Beállítások mentése a lemezre\n"
 
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 
 #, fuzzy
@@ -7901,7 +7897,7 @@ msgstr ""
 msgid "list of options"
 msgstr "konfigurációs paraméterek beállítása"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7911,7 +7907,7 @@ msgstr "konfigurációs paraméterek beállítása"
 msgid "plugin pointer (optional)"
 msgstr ""
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7922,7 +7918,7 @@ msgstr "Aliaszok listája:\n"
 msgid "proxy pointer (optional)"
 msgstr "Beállítások mentése a lemezre\n"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -8149,7 +8145,7 @@ msgstr "Aliaszok listája:\n"
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -9154,9 +9150,7 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "Aliaszok listája:\n"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -9448,8 +9442,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/it.po b/po/it.po
index 990d2b0bd..d342ddca8 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -791,10 +791,10 @@ msgstr "predefinito: "
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sOpzione \"%s\" non trovata (è possibile usare \"*\" all'inizio e/o fine "
 "dell'opzione per visualizzare una sottolista)"
@@ -1524,12 +1524,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1794,6 +1794,7 @@ msgstr ""
 "unbindctxt <contesto> <chiave> || reset <tasto> || resetctxt <contesto> "
 "<tasto> || resetall -yes [<contesto>] || missing [<contesto>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1829,7 +1830,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2358,8 +2359,9 @@ msgstr "imposta le opzioni di configurazione"
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opzione> [<valore>]] || diff [<opzione> [<opzione>...]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2413,9 +2415,10 @@ msgstr "annulla/ripristina opzione"
 msgid "<option>"
 msgstr "<opzione>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -3129,11 +3132,11 @@ msgstr ""
 "i)Flashcode|flashy\""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -3881,11 +3884,12 @@ msgid ""
 "defined with command /proxy"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "elenco separato da virgole di plugin da caricare automaticamente all'avvio, "
 "\"*\" equivale a tutti i plugin trovati. un nome che comincia con \"!\" è un "
@@ -4553,7 +4557,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4638,7 +4642,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "puntatore all'alias (opzionale)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome alias (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -5535,8 +5540,7 @@ msgstr "[-current] [-exclude=<canale>[,<canale>...]] <comando> [<argomenti>]"
 #, fuzzy
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5576,8 +5580,7 @@ msgstr "[-current] [-exclude=<canale>[,<canale>...]] <comando> [<argomenti>]"
 #, fuzzy
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5615,8 +5618,7 @@ msgstr "[-exclude=<server>[,<server>...]] <comando> [<argomenti>]"
 
 #, fuzzy
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5786,11 +5788,14 @@ msgstr "revoca lo stato di half-op del canale da uno o più nick"
 msgid "<nick> [<nick>...]"
 msgstr "<nick> [<nick>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"nome alias (può iniziare o terminare con \"*\" come carattere jolly) "
+"(opzionale)"
 
 msgid "remove channel operator status from nick(s)"
 msgstr "revoca lo stato di operatore del canale da uno o più nick"
@@ -5798,18 +5803,21 @@ msgstr "revoca lo stato di operatore del canale da uno o più nick"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<nick> [<nick>...] || * -yes"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"nome alias (può iniziare o terminare con \"*\" come carattere jolly) "
+"(opzionale)"
 
 msgid "remove voice from nick(s)"
 msgstr "revoca il voice da uno o più nick"
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "nome alias (può iniziare o terminare con \"*\" come carattere jolly) "
@@ -5840,10 +5848,13 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "concede lo stato di half-op del canale ad uno o più nick"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
+"nick: nick o mask (può iniziare o terminare con \"*\" come carattere jolly)\n"
+"   *: concede il voice a tutti sul canale"
 
 msgid "ignore nicks/hosts from servers or channels"
 msgstr "ignora nick/host dai server o dai canali"
@@ -6261,10 +6272,13 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr "concede lo stato di operatore del canale ad uno o più nick"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
+"nick: nick o mask (può iniziare o terminare con \"*\" come carattere jolly)\n"
+"   *: concede il voice a tutti sul canale"
 
 msgid "get operator privileges"
 msgstr "ottiene i privilegi di operatore"
@@ -6653,8 +6667,9 @@ msgstr ""
 msgid "give voice to nick(s)"
 msgstr "concede il voice ad uno o più utenti"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "nick: nick o mask (può iniziare o terminare con \"*\" come carattere jolly)\n"
@@ -7207,9 +7222,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 msgid "display server away message in away bar item"
@@ -7713,7 +7727,8 @@ msgstr "elenco di server IRC"
 msgid "server pointer (optional)"
 msgstr "puntatore al server (opzionale)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome server (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -8820,7 +8835,8 @@ msgstr "elenco delle barre"
 msgid "bar pointer (optional)"
 msgstr "puntatore alla barra (opzionale)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome barra (può iniziare o terminare con \"*\" come carattere jolly "
 "(opzionale)"
@@ -8831,7 +8847,8 @@ msgstr "elenco degli elementi barra"
 msgid "bar item pointer (optional)"
 msgstr "puntatore all'elemento della barra (opzionale)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome dell'elemento della barra (può iniziare o terminare con \"*\" come "
 "carattere jolly) (opzionale)"
@@ -8848,7 +8865,8 @@ msgstr "elenco dei buffer"
 msgid "buffer pointer (optional)"
 msgstr "puntatore al buffer (opzionale)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome buffer (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -8862,7 +8880,8 @@ msgstr "puntatore al buffer"
 msgid "list of filters"
 msgstr "elenco dei filtri"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome filtro (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -8881,9 +8900,10 @@ msgstr "elenco di hook"
 msgid "hook pointer (optional)"
 msgstr "puntatore all'hook (opzionale)"
 
+#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "tipo,argomenti (il tipo è comando/timer/.., gli argomenti sono necessari "
 "solo per ottenere alcuni hook, (possono iniziare o terminare con \"*\" come "
@@ -8910,7 +8930,8 @@ msgstr "nick_xxx o group_xxx per ottenere solo xxx di nick/group (opzionale)"
 msgid "list of options"
 msgstr "elenco delle opzioni"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome opzione (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -8921,7 +8942,8 @@ msgstr "elenco dei plugin"
 msgid "plugin pointer (optional)"
 msgstr "puntatore al plugin (opzionale)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome plugin (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -8932,7 +8954,8 @@ msgstr "elenco dei proxy"
 msgid "proxy pointer (optional)"
 msgstr "puntatore al proxy (opzionale)"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome del proxy (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -9147,7 +9170,8 @@ msgstr "elenco degli script"
 msgid "script pointer (optional)"
 msgstr "puntatore allo script (opzionale)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome script (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -10194,9 +10218,8 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "URL per il file con l'elenco degli script"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+#, fuzzy
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome script con l'estensione (può iniziare o terminare con \"*\" come "
 "carattere jolly) (opzionale)"
@@ -10490,8 +10513,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/ja.po b/po/ja.po
index b535e09fb..655add4e9 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -791,10 +791,10 @@ msgstr "デフォルト: "
 msgid "(unknown)"
 msgstr "(未定義)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sオプション \"%s\" が見つかりません (ヒント: sublist を見るには、\"*\" をオ"
 "プションの最初と最後に付けてください)"
@@ -1522,12 +1522,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1796,6 +1796,7 @@ msgstr ""
 "<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
 "[<context>] || missing [<context>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1831,7 +1832,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2389,8 +2390,9 @@ msgstr "オプションの設定"
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<option> [<value>]] || diff [<option> [<option>...]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2443,9 +2445,10 @@ msgstr "オプションのアンセット/リセット"
 msgid "<option>"
 msgstr "<option>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -3175,12 +3178,13 @@ msgstr ""
 "ればいけない、正規表現は大文字小文字を区別しない (最初に \"(?-i)\" がある場合"
 "は区別する)、例: \"flashcode|flashy\"、\"(?-i)FlashCode|flashy\""
 
+#, fuzzy
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
 "ハイライトするタグのコンマ区切りリスト; 大文字小文字の区別なし; 1 つ以上のタ"
 "グにマッチさせるには各タグの最初と最後に \"*\" をつけてください; 論理積 \"and"
@@ -3911,11 +3915,12 @@ msgstr ""
 "ストをダウンロードする際および hook_process 関数から呼び出されるスクリプト内"
 "で利用); プロキシを定義するには /proxy コマンドを利用してください"
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "スタートアップ時にロードするプラグインのコンマ区切りリスト、\"*\" は見つかっ"
 "た全てのプラグイン、\"!\" から始まる名前はロードしないプラグイン、\"*\" から"
@@ -4588,13 +4593,13 @@ msgstr "コマンドの別名を作成"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <completion>] <alias> [<command> [;<command>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4675,7 +4680,8 @@ msgstr "%s%s: 別名 \"%s\" の補完候補作成中にエラー: 別名が見
 msgid "alias pointer (optional)"
 msgstr "別名のポインタ (任意)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "別名の名前 (ワイルドカードとして \"*\" で始めるか終わるかできます) (任意)"
 
@@ -5636,10 +5642,10 @@ msgstr "全てのサーバ、全てのチャンネルに対してコマンドを
 msgid "[-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]"
 msgstr "[-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]"
 
+#, fuzzy
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5675,10 +5681,10 @@ msgstr "全ての接続済みサーバの全てのプライベートバッファ
 msgid "[-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]"
 msgstr "[-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]"
 
+#, fuzzy
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5717,9 +5723,9 @@ msgstr "全ての接続済みサーバでコマンドを実行"
 msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 
+#, fuzzy
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5888,8 +5894,9 @@ msgstr "ニックネームから half-operator 権を剥奪"
 msgid "<nick> [<nick>...]"
 msgstr "<nick> [<nick>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -5903,8 +5910,9 @@ msgstr "ニックネームからチャンネルオペレータ権を剥奪"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<nick> [<nick>...] || * -yes"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -5915,8 +5923,9 @@ msgstr ""
 msgid "remove voice from nick(s)"
 msgstr "ニックネームから発言権を剥奪"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "nick: ニックネームまたはマスク (ワイルドカード \"*\" を最初と最後につけること"
@@ -5946,8 +5955,9 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "指定したニックネームに half-operator 権を付与"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 "nick: ニックネームまたはマスク (ワイルドカード \"*\" を最初と最後につけること"
@@ -6364,8 +6374,9 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr "ニックネームにオペレータ権を付与"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 "nick: ニックネームまたはマスク (ワイルドカード \"*\" を最初と最後につけること"
@@ -6748,8 +6759,9 @@ msgstr ""
 msgid "give voice to nick(s)"
 msgstr "ニックネームに発言権を付与"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "nick: ニックネームまたはマスク (ワイルドカード \"*\" を最初と最後につけること"
@@ -7298,12 +7310,12 @@ msgstr ""
 "ファには影響なし)、空文字列はニックネームに関するデフォルトのハイライトを無効"
 "にする、例: \"$nick\", \"(?-i)$nick\""
 
+#, fuzzy
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 "irc バッファでハイライトを禁止するタグ (ユーザメッセージをハイライトして、"
 "サーバメッセージをハイライトしない); タグの区切り文字はコンマ、論理積を取る場"
@@ -7829,7 +7841,8 @@ msgstr "IRC サーバのリスト"
 msgid "server pointer (optional)"
 msgstr "サーバポインタ (任意)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr "サーバ名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "list of channels for an IRC server"
@@ -8920,7 +8933,8 @@ msgstr "バーのリスト"
 msgid "bar pointer (optional)"
 msgstr "バーポインタ (任意)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr "バー名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "list of bar items"
@@ -8929,7 +8943,8 @@ msgstr "バーアイテムのリスト"
 msgid "bar item pointer (optional)"
 msgstr "バーアイテムポインタ (任意)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr "バーアイテム名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "list of bar windows"
@@ -8944,7 +8959,8 @@ msgstr "バッファのリスト"
 msgid "buffer pointer (optional)"
 msgstr "バッファポインタ (任意)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr "バッファ名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "lines of a buffer"
@@ -8956,7 +8972,8 @@ msgstr "バッファポインタ"
 msgid "list of filters"
 msgstr "フィルタのリスト"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr "フィルタ名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "history of commands"
@@ -8972,9 +8989,10 @@ msgstr "フックリスト"
 msgid "hook pointer (optional)"
 msgstr "フックポインタ (任意)"
 
+#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "type,arguments (type はコマンド/タイマー/..、arguments はいくつかのフックで必"
 "要 (ワイルドカードとして \"*\" で始めるか終われる)、両方とも任意)"
@@ -9002,7 +9020,8 @@ msgstr ""
 msgid "list of options"
 msgstr "オプションリスト"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr "オプション名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "list of plugins"
@@ -9011,7 +9030,8 @@ msgstr "プラグインリスト"
 msgid "plugin pointer (optional)"
 msgstr "プラグインポインタ (任意)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr "プラグイン名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "list of proxies"
@@ -9020,7 +9040,8 @@ msgstr "プロキシリスト"
 msgid "proxy pointer (optional)"
 msgstr "プロキシポインタ (任意)"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr "プロキシ名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "options for URL"
@@ -9227,7 +9248,8 @@ msgstr "スクリプトのリスト"
 msgid "script pointer (optional)"
 msgstr "スクリプトポインタ (任意)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr "スクリプト名 (ワイルドカードとして \"*\" で始めるか終われる) (任意)"
 
 msgid "callback of a script"
@@ -10364,9 +10386,8 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "ファイルの URL とスクリプトのリスト"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+#, fuzzy
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "拡張子を含めたスクリプト名 (ワイルドカードとして \"*\" で始めるか終われる) "
 "(任意)"
@@ -10610,6 +10631,7 @@ msgstr ""
 "[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
 "monitor [<filter>]"
 
+#, fuzzy
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -10663,8 +10685,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/pl.po b/po/pl.po
index 93c7f5191..88bd080e1 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -801,10 +801,10 @@ msgstr "domyślnie: "
 msgid "(unknown)"
 msgstr "(nieznane)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sNie znaleziono opcji \"%s\" (porada: możesz użyć \"*\" na początku i/lub "
 "końcu opcji, aby uzyskać listę)"
@@ -1549,12 +1549,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1831,6 +1831,7 @@ msgstr ""
 "resetctxt <kontekst> <klawisz> || resetall -yes [<kontekst>] || missing "
 "[<kontekst>]"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
@@ -1866,7 +1867,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2433,8 +2434,9 @@ msgstr "ustawia opcje konfiguracyjne"
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opcja> [<wartość>]] || diff [<opcja> [<opcja>...]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2488,9 +2490,10 @@ msgstr "skasuj/zresetuj zmienną konfiguracyjną"
 msgid "<option>"
 msgstr "<opcja>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -3233,12 +3236,13 @@ msgstr ""
 "początku, aby wielkość znaków miała znaczenie), przykłady: \"flashcode|flashy"
 "\", \"(?-i)FlashCode|flashy\""
 
+#, fuzzy
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
 "oddzielona przecinkami lista tagów do podświetleń; porównywanie z "
 "uwzględnieniem wielkości znaków; każdy tag może zaczynać się lub kończyć \"*"
@@ -3988,11 +3992,12 @@ msgstr ""
 "pobierania listy skryptów oraz w skryptach wywołujących funkcję "
 "hook_process); pośrednik musi być zdefiniowany za pomocą komendy /proxy"
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "oddzielona przecinkami lista wtyczek do automatycznego załadowania podczas "
 "startu, \"*\" oznacza wszystkie znalezione wtyczki, nazwa zaczynająca się od "
@@ -4672,13 +4677,13 @@ msgstr "tworzy alias do komendy"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <dopełnienie>] <alias> [<komenda> [;<komenda>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4764,7 +4769,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "wskaźnik aliasu (opcjonalny)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa aliasu (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "Spell checker for input (with Aspell)"
@@ -5657,10 +5663,10 @@ msgstr "wykonuje komendę na wszystkich kanałach na połączonych serwerach"
 msgid "[-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]"
 msgstr "[-current] [-exclude=<kanał>[,<kanał>...]] <komenda> [<argumenty>]"
 
+#, fuzzy
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5701,8 +5707,7 @@ msgstr "[-current] [-exclude=<kanał>[,<kanał>...]] <komenda> [<argumenty>]"
 #, fuzzy
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5739,9 +5744,9 @@ msgstr "wykonuje komendę na wszystkich połączonych serwerach"
 msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr "[-exclude=<serwer>[,<serwer>...]] <komenda> [<argumenty>]"
 
+#, fuzzy
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5916,8 +5921,9 @@ msgstr "usuwa status halfopa kanału"
 msgid "<nick> [<nick>...]"
 msgstr "<nick> [<nick>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -5930,8 +5936,9 @@ msgstr "usuwa status operatora kanału"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<nick> [<nick>...] || * -yes"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -5941,8 +5948,9 @@ msgstr ""
 msgid "remove voice from nick(s)"
 msgstr "usuwa flagę voice"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "nick: nick lub maska (może zaczynać się lub kończyć \"*\")\n"
@@ -5972,8 +5980,9 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "nadaje status halfopa nickowi(m)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 "nick: nick lub maska (może zaczynać się lub kończyć \"*\")\n"
@@ -6397,8 +6406,9 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr "nadaje uprawienia operatora kanału"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 "nick: nick lub maska (może zaczynać się lub kończyć \"*\")\n"
@@ -6790,8 +6800,9 @@ msgstr ""
 msgid "give voice to nick(s)"
 msgstr "daje głos (voice) nickowi(-m)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "nick: nick lub maska (może zaczynać się lub kończyć \"*\")\n"
@@ -7358,12 +7369,12 @@ msgstr ""
 "tworzony (nie ma wpływu na obecne bufory), pusty ciąg wyłącza domyślne "
 "podświetlenia nicka, przykłady: \"$nick\", \"(?-i)$nick\""
 
+#, fuzzy
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 "ogranicza podświetlenia do tych tagów w buforach irc (żeby mieć "
 "podświetlenia tylko od wiadomości użytkowników ale nie serwera); tagi muszą "
@@ -7905,7 +7916,8 @@ msgstr "lista serwerów IRC"
 msgid "server pointer (optional)"
 msgstr "wskaźnik serwera (opcjonalny)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa serwera (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of channels for an IRC server"
@@ -9004,7 +9016,8 @@ msgstr "lista pasków"
 msgid "bar pointer (optional)"
 msgstr "wskaźnik paska (opcjonalne)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa paska (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of bar items"
@@ -9013,7 +9026,8 @@ msgstr "lista elementów pasków"
 msgid "bar item pointer (optional)"
 msgstr "wskaźnik elementu paska (opcjonalne)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nazwa elementu paska (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
@@ -9029,7 +9043,8 @@ msgstr "lista buforów"
 msgid "buffer pointer (optional)"
 msgstr "wskaźnik bufora (opcjonalne)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa bufora (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "lines of a buffer"
@@ -9041,7 +9056,8 @@ msgstr "wskaźnik bufora"
 msgid "list of filters"
 msgstr "lista filtrów"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa filtru (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "history of commands"
@@ -9057,9 +9073,10 @@ msgstr "lista powiązań"
 msgid "hook pointer (optional)"
 msgstr "wskaźnik uchwytu (opcjonalne)"
 
+#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 "typ,argumenty (typ to komenda/timer/.., argumenty do uzyskania tylko "
 "niektórych hooków (mogą zaczynać się lub kończyć \"*\"), oba są opcjonalne)"
@@ -9087,7 +9104,8 @@ msgstr ""
 msgid "list of options"
 msgstr "lista opcji"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa opcji (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of plugins"
@@ -9096,7 +9114,8 @@ msgstr "lista wtyczek"
 msgid "plugin pointer (optional)"
 msgstr "wskaźnik wtyczki (opcjonalne)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa wtyczki (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of proxies"
@@ -9105,7 +9124,8 @@ msgstr "lista pośredników"
 msgid "proxy pointer (optional)"
 msgstr "wskaźnik pośrednika (opcjonalny)"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa pośrednika (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "options for URL"
@@ -9315,7 +9335,8 @@ msgstr "lista skryptów"
 msgid "script pointer (optional)"
 msgstr "wskaźnik skryptu (opcjonalne)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr "nazwa skryptu (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "callback of a script"
@@ -10463,9 +10484,8 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "adres URL pliku z lista skryptów"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+#, fuzzy
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nazwa skryptu z rozszerzeniem (może się zaczynać lub kończyć \"*\") "
 "(opcjonalne)"
@@ -10759,8 +10779,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c9811a8c7..b775db1cf 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -825,10 +825,10 @@ msgstr "padrão: "
 msgid "(unknown)"
 msgstr "(desconhecido)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sOpção \"%s\" não encontrada (dica: você pode usar \"*\" no começo e/ou fim "
 "da opção para ver uma sublista)"
@@ -1503,12 +1503,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1803,7 +1803,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -2227,8 +2227,9 @@ msgstr "define opções de configuração"
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opção> [<valor>]] || diff [<opção> [<opção>...]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -2281,9 +2282,10 @@ msgstr "indefine/restaura opções de configuração"
 msgid "<option>"
 msgstr "<opção>"
 
+#, fuzzy
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2964,11 +2966,11 @@ msgstr ""
 "em conta maiúscula/minúscula, exemplo: \"FlashCode|flashy\""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -3669,11 +3671,12 @@ msgid ""
 "defined with command /proxy"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "lista separada por vírgulas dos plugins para carregar automaticamente "
 "nainicialização, \"*\" significa todos os plugins encontrados, um nome "
@@ -4315,7 +4318,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -4366,7 +4369,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "ponteiro de atalhos (opcional)"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -5218,8 +5222,7 @@ msgstr ""
 
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5243,8 +5246,7 @@ msgstr "<apelido>[,<apelido>...] [<contador> [<target>]]"
 
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5267,8 +5269,7 @@ msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr ""
 
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -5379,11 +5380,14 @@ msgstr "remover status de semi-operador do(s) apelido(s)"
 msgid "<nick> [<nick>...]"
 msgstr "<apelido> [<apelido>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
+"(opcional)"
 
 msgid "remove channel operator status from nick(s)"
 msgstr "remover status de operador de canal do(s) apelido(s)"
@@ -5392,18 +5396,21 @@ msgstr "remover status de operador de canal do(s) apelido(s)"
 msgid "<nick> [<nick>...] || * -yes"
 msgstr "<apelido> [<apelido>...]"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
+"nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
+"(opcional)"
 
 msgid "remove voice from nick(s)"
 msgstr ""
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 "nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
@@ -5428,10 +5435,13 @@ msgstr ""
 msgid "give channel half-operator status to nick(s)"
 msgstr "dar status de semi-operador de canal ao(s) apelido(s)"
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
+"nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
+"(opcional)"
 
 msgid "ignore nicks/hosts from servers or channels"
 msgstr "ignorar apelidos/hosts de servidores ou canais"
@@ -5721,10 +5731,13 @@ msgstr ""
 msgid "give channel operator status to nick(s)"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
+"nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
+"(opcional)"
 
 msgid "get operator privileges"
 msgstr ""
@@ -6029,7 +6042,7 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 "nome do atalho (pode começar ou terminar com \"*\" como um coringa) "
@@ -6526,9 +6539,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 msgid "display server away message in away bar item"
@@ -6978,7 +6990,8 @@ msgstr "lista de servidores IRC"
 msgid "server pointer (optional)"
 msgstr "pointeiro do servidor (opcional)"
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do servidor (pode começar ou terminar com \"*\" como coringa) (opcional)"
 
@@ -8057,7 +8070,8 @@ msgstr "lista de barras"
 msgid "bar pointer (optional)"
 msgstr "ponteiro da barra (opcional)"
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome da barra (pode começar ou terminar com \"*\" como um coringa) (opcional)"
 
@@ -8067,7 +8081,8 @@ msgstr "lista de itens da barra"
 msgid "bar item pointer (optional)"
 msgstr "ponteiro do item da barra (opcional)"
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do item da barra (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -8084,7 +8099,8 @@ msgstr "lista de buffers"
 msgid "buffer pointer (optional)"
 msgstr "ponteiro do buffer (opcional)"
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do buffer (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -8098,7 +8114,8 @@ msgstr "pointeiro do buffer"
 msgid "list of filters"
 msgstr "lista de filtros"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do filtro (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -8120,7 +8137,7 @@ msgstr "ponteiro do apelido (opcional)"
 
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 
 msgid "list of buffers in hotlist"
@@ -8145,7 +8162,8 @@ msgstr ""
 msgid "list of options"
 msgstr "lista de opções"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome da opção (pode começar ou terminar com \"*\" como um coringa) (opcional)"
 
@@ -8155,7 +8173,8 @@ msgstr "lista de plugins"
 msgid "plugin pointer (optional)"
 msgstr "pointeiro do plugin (opcional)"
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do plugin (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -8169,7 +8188,7 @@ msgid "proxy pointer (optional)"
 msgstr "ponteiro da barra (opcional)"
 
 #, fuzzy
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome da barra (pode começar ou terminar com \"*\" como um coringa) (opcional)"
 
@@ -8382,7 +8401,8 @@ msgstr "list de scripts"
 msgid "script pointer (optional)"
 msgstr "apontador do script (opcional)"
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+#, fuzzy
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do script (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -9392,9 +9412,7 @@ msgid "URL for file with list of scripts"
 msgstr "list de scripts"
 
 #, fuzzy
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 "nome do script (pode começar ou terminar com \"*\" como um coringa) "
 "(opcional)"
@@ -9688,8 +9706,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/ru.po b/po/ru.po
index 694b4d113..d6f0817f5 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -851,10 +851,10 @@ msgstr "  . значение по умолчанию: %d\n"
 msgid "(unknown)"
 msgstr "(неизвестен)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 "%sОпция \"%s\" не найдена (подсказка: Вы можете использовать \"*\" в начале "
 "и/или конце названия опции чтобы увидеть список похожих)"
@@ -1397,12 +1397,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1589,7 +1589,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -1935,7 +1935,7 @@ msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[параметр [ = значение]]"
 
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -1968,8 +1968,8 @@ msgid "<option>"
 msgstr "[команда]"
 
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2542,11 +2542,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -3224,8 +3224,8 @@ msgstr ""
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 "разделённый запятыми список автоматически загружаемых при запуске plug-"
 "in'ов , \"*\" означает все найденные plug-in'ы (имена могут быть не полными, "
@@ -3883,7 +3883,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -3949,7 +3949,7 @@ msgstr "%s параметр конфигурации \"%s\" не найден\n"
 msgid "alias pointer (optional)"
 msgstr "настроить параметры конфигурации"
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "Spell checker for input (with Aspell)"
@@ -4797,8 +4797,7 @@ msgstr "[сокращение [команда [аргументы]]]"
 
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4823,8 +4822,7 @@ msgstr "[сокращение [команда [аргументы]]]"
 
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4848,8 +4846,7 @@ msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr ""
 
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4995,7 +4992,7 @@ msgid "<nick> [<nick>...]"
 msgstr "ник [ник ...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -5009,7 +5006,7 @@ msgid "<nick> [<nick>...] || * -yes"
 msgstr "ник [ник ...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -5019,7 +5016,7 @@ msgid "remove voice from nick(s)"
 msgstr "снимает право голоса с ника(-ов)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 
@@ -5050,7 +5047,7 @@ msgid "give channel half-operator status to nick(s)"
 msgstr "даёт статус оператора канала нику(-ам)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 
@@ -5406,7 +5403,7 @@ msgid "give channel operator status to nick(s)"
 msgstr "даёт статус оператора канала нику(-ам)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 
@@ -5825,7 +5822,7 @@ msgid "give voice to nick(s)"
 msgstr "даёт право голоса нику(-ам)"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 
@@ -6317,9 +6314,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 #, fuzzy
@@ -6771,7 +6767,7 @@ msgstr "порт IRC сервера"
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7837,7 +7833,7 @@ msgstr "Список сокращений:\n"
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7847,7 +7843,7 @@ msgstr "Список сокращений:\n"
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7864,7 +7860,7 @@ msgstr "Список сокращений:\n"
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7879,7 +7875,7 @@ msgstr "поиск текста в истории буфера"
 msgid "list of filters"
 msgstr "Список сокращений:\n"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7899,7 +7895,7 @@ msgstr "Сохраняю конфигурацию\n"
 
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 
 #, fuzzy
@@ -7928,7 +7924,7 @@ msgstr ""
 msgid "list of options"
 msgstr "настроить параметры конфигурации"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7938,7 +7934,7 @@ msgstr "настроить параметры конфигурации"
 msgid "plugin pointer (optional)"
 msgstr ""
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -7949,7 +7945,7 @@ msgstr "Список сокращений:\n"
 msgid "proxy pointer (optional)"
 msgstr "Сохраняю конфигурацию\n"
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -8175,7 +8171,7 @@ msgstr "Список сокращений:\n"
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -9179,9 +9175,7 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr "Список сокращений:\n"
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -9472,8 +9466,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/tr.po b/po/tr.po
index 20c7c3488..fa054ae70 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\n"
 "PO-Revision-Date: 2014-03-24 14:23+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -755,8 +755,8 @@ msgstr "(bilinmiyor)"
 
 #, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 
 msgid "No option found"
@@ -1231,12 +1231,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1413,7 +1413,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -1729,7 +1729,7 @@ msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<seçenek> [<değer>]] || diff [<seçenek> [<seçenek>...]]"
 
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -1760,8 +1760,8 @@ msgid "<option>"
 msgstr "<seçenek>"
 
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2267,11 +2267,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -2854,8 +2854,8 @@ msgstr ""
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 
 msgid ""
@@ -3464,7 +3464,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -3515,7 +3515,7 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr ""
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "Spell checker for input (with Aspell)"
@@ -4331,8 +4331,7 @@ msgstr "[-current] [-exclude=<kanal>[,<kanal>...]] <komut> [<argümanlar>]"
 
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4356,8 +4355,7 @@ msgstr "[-current] [-exclude=<kanal>[,<kanal>...]] <komut> [<argümanlar>]"
 
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4380,8 +4378,7 @@ msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr "[-exclude=<sunucu>[,<sunucu>...]] <komut> [<argümanlar>]"
 
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4495,7 +4492,7 @@ msgid "<nick> [<nick>...]"
 msgstr "<rumuz> [<rumuz>...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -4508,7 +4505,7 @@ msgid "<nick> [<nick>...] || * -yes"
 msgstr "<rumuz> [<rumuz>...]"
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -4517,7 +4514,7 @@ msgid "remove voice from nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 
@@ -4541,7 +4538,7 @@ msgid "give channel half-operator status to nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 
@@ -4835,7 +4832,7 @@ msgid "give channel operator status to nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 
@@ -5181,7 +5178,7 @@ msgid "give voice to nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 
@@ -5611,9 +5608,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 msgid "display server away message in away bar item"
@@ -6022,7 +6018,7 @@ msgstr "İRC sunucularının listesi"
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of channels for an IRC server"
@@ -7029,7 +7025,7 @@ msgstr ""
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of bar items"
@@ -7038,7 +7034,7 @@ msgstr ""
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of bar windows"
@@ -7053,7 +7049,7 @@ msgstr ""
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "lines of a buffer"
@@ -7065,7 +7061,7 @@ msgstr ""
 msgid "list of filters"
 msgstr "filtrelerin listesi"
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "history of commands"
@@ -7082,7 +7078,7 @@ msgstr ""
 
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 
 msgid "list of buffers in hotlist"
@@ -7106,7 +7102,7 @@ msgstr ""
 msgid "list of options"
 msgstr "seçeneklerin listesi"
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of plugins"
@@ -7115,7 +7111,7 @@ msgstr "eklentilerin listesi"
 msgid "plugin pointer (optional)"
 msgstr ""
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of proxies"
@@ -7124,7 +7120,7 @@ msgstr ""
 msgid "proxy pointer (optional)"
 msgstr ""
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "options for URL"
@@ -7308,7 +7304,7 @@ msgstr "betiklerin listesi"
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -8249,9 +8245,7 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr ""
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "scripts from repository"
@@ -8535,8 +8529,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 27793f61b..0972f78f6 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: 2014-04-12 17:30+0200\n"
+"POT-Creation-Date: 2014-04-12 22:51+0200\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"
@@ -756,8 +756,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%sOption \"%s\" not found (tip: you can use \"*\" at beginning and/or end of "
-"option to see a sublist)"
+"%sOption \"%s\" not found (tip: you can use wildcard \"*\" in option to see "
+"a sublist)"
 msgstr ""
 
 msgid "No option found"
@@ -1237,12 +1237,12 @@ msgid ""
 "#weechat\")\n"
 "         - \"*\" means all buffers\n"
 "         - a name starting with '!' is excluded\n"
-"         - name can start or end with '*' to match many buffers\n"
+"         - wildcard \"*\" is allowed\n"
 "   tags: comma separated list of tags, for example \"irc_join,irc_part,"
 "irc_quit\"\n"
 "         - logical \"and\": use \"+\" between tags (for example: \"nick_toto"
 "+irc_action\")\n"
-"         - tags can start or end with '*'\n"
+"         - wildcard \"*\" is allowed\n"
 "  regex: POSIX extended regular expression to search in line\n"
 "         - use '\\t' to separate prefix from message, special chars like '|' "
 "must be escaped: '\\|'\n"
@@ -1419,7 +1419,7 @@ msgid ""
 "   bar(xxx): bar \"xxx\"\n"
 "    item(*): any bar item\n"
 "  item(xxx): bar item \"xxx\"\n"
-"The key can start or end with '*' to match many mouse events.\n"
+"Wildcard \"*\" is allowed in key to match many mouse events.\n"
 "A special value for command with format \"hsignal:name\" can be used for "
 "context mouse, this will send the hsignal \"name\" with the focus hashtable "
 "as argument.\n"
@@ -1732,7 +1732,7 @@ msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr ""
 
 msgid ""
-"option: name of an option (can start or end with '*' to list many options)\n"
+"option: name of an option (wildcard \"*\" is allowed)\n"
 " value: new value for option\n"
 "  diff: display only changed options\n"
 "\n"
@@ -1763,8 +1763,8 @@ msgid "<option>"
 msgstr ""
 
 msgid ""
-"option: name of an option (may begin or end with \"*\" to mass-reset "
-"options, use carefully!)\n"
+"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
+"use carefully!)\n"
 "\n"
 "According to option, it's reset (for standard options) or removed (for "
 "optional settings, like server values).\n"
@@ -2269,11 +2269,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"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\""
+"comma separated list of tags to highlight; case insensitive comparison; "
+"wildcard \"*\" is allowed in each 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 ""
@@ -2856,8 +2856,8 @@ msgstr ""
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found, a name beginning with \"!\" is a negative value to "
-"prevent a plugin from being loaded, names can start or end with \"*\" to "
-"match several plugins (examples: \"*\" or \"*,!lua,!tcl\")"
+"prevent a plugin from being loaded, wildcard \"*\" is allowed in names "
+"(examples: \"*\" or \"*,!lua,!tcl\")"
 msgstr ""
 
 msgid ""
@@ -3468,7 +3468,7 @@ msgid ""
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
-"     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"     alias: name of alias (wildcard \"*\" is allowed)\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -3519,7 +3519,7 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr ""
 
-msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
+msgid "alias name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "Spell checker for input (with Aspell)"
@@ -4332,8 +4332,7 @@ msgstr ""
 
 msgid ""
 " -current: execute command for channels of current server only\n"
-" -exclude: exclude some channels ('*' is allowed at beginning or end of "
-"channel name, to exclude many channels)\n"
+" -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4356,8 +4355,7 @@ msgstr ""
 
 msgid ""
 " -current: execute command for private buffers of current server only\n"
-" -exclude: exclude some nicks ('*' is allowed at beginning or end of nick "
-"name, to exclude many nicks)\n"
+" -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4380,8 +4378,7 @@ msgid "[-exclude=<server>[,<server>...]] <command> [<arguments>]"
 msgstr ""
 
 msgid ""
-" -exclude: exclude some servers ('*' is allowed at beginning or end of "
-"server name, to exclude many servers)\n"
+" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
 "  command: command to execute\n"
 "arguments: arguments for command (special variables $nick, $channel and "
 "$server are replaced by their value)\n"
@@ -4493,7 +4490,7 @@ msgid "<nick> [<nick>...]"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel half-operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -4505,7 +4502,7 @@ msgid "<nick> [<nick>...] || * -yes"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove channel operator status from everybody on channel except "
 "yourself"
 msgstr ""
@@ -4514,7 +4511,7 @@ msgid "remove voice from nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: remove voice from everybody on channel"
 msgstr ""
 
@@ -4538,7 +4535,7 @@ msgid "give channel half-operator status to nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel half-operator status to everybody on channel"
 msgstr ""
 
@@ -4826,7 +4823,7 @@ msgid "give channel operator status to nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give channel operator status to everybody on channel"
 msgstr ""
 
@@ -5128,7 +5125,7 @@ msgid "give voice to nick(s)"
 msgstr ""
 
 msgid ""
-"nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+"nick: nick or mask (wildcard \"*\" is allowed)\n"
 "   *: give voice to everybody on channel"
 msgstr ""
 
@@ -5557,9 +5554,8 @@ msgstr ""
 msgid ""
 "restrict highlights to these tags on irc buffers (to have highlight on user "
 "messages but not server messages); tags must be separated by a comma and \"+"
-"\" can be used to make a logical \"and\" between tags; tags can start or end "
-"with \"*\" to match more than one tag; an empty value allows highlight on "
-"any tag"
+"\" can be used to make a logical \"and\" between tags; wildcard \"*\" is "
+"allowed in tags; an empty value allows highlight on any tag"
 msgstr ""
 
 msgid "display server away message in away bar item"
@@ -5965,7 +5961,7 @@ msgstr ""
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as wildcard) (optional)"
+msgid "server name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of channels for an IRC server"
@@ -6976,7 +6972,7 @@ msgstr ""
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of bar items"
@@ -6985,7 +6981,7 @@ msgstr ""
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
+msgid "bar item name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of bar windows"
@@ -7000,7 +6996,7 @@ msgstr ""
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
+msgid "buffer name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "lines of a buffer"
@@ -7012,7 +7008,7 @@ msgstr ""
 msgid "list of filters"
 msgstr ""
 
-msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
+msgid "filter name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "history of commands"
@@ -7029,7 +7025,7 @@ msgstr ""
 
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
-"(can start or end with \"*\" as wildcard), both are optional)"
+"(wildcard \"*\" is allowed), both are optional)"
 msgstr ""
 
 msgid "list of buffers in hotlist"
@@ -7053,7 +7049,7 @@ msgstr ""
 msgid "list of options"
 msgstr ""
 
-msgid "option name (can start or end with \"*\" as wildcard) (optional)"
+msgid "option name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of plugins"
@@ -7062,7 +7058,7 @@ msgstr ""
 msgid "plugin pointer (optional)"
 msgstr ""
 
-msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
+msgid "plugin name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "list of proxies"
@@ -7071,7 +7067,7 @@ msgstr ""
 msgid "proxy pointer (optional)"
 msgstr ""
 
-msgid "proxy name (can start or end with \"*\" as wildcard) (optional)"
+msgid "proxy name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "options for URL"
@@ -7255,7 +7251,7 @@ msgstr ""
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as wildcard) (optional)"
+msgid "script name (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "callback of a script"
@@ -8190,9 +8186,7 @@ msgstr ""
 msgid "URL for file with list of scripts"
 msgstr ""
 
-msgid ""
-"script name with extension (can start or end with \"*\" as wildcard) "
-"(optional)"
+msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
 
 msgid "scripts from repository"
@@ -8472,8 +8466,8 @@ msgid ""
 "    default: restore default triggers\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
-"for example \"@signal\"), many filters can be separated by commas; each "
-"trigger name can start or end with \"*\"\n"
+"for example \"@signal\"), many filters can be separated by commas; wildcard "
+"\"*\" is allowed in each trigger name\n"
 "\n"
 "When a trigger callback is called, following actions are performed, in this "
 "order:\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index a0ad2bd28..0a173c814 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -5593,8 +5593,7 @@ command_set_display_option_lists (char **argv, int arg_start, int arg_end,
             {
                 gui_chat_printf (NULL,
                                  _("%sOption \"%s\" not found (tip: you can use "
-                                   "\"*\" at beginning and/or end of option to "
-                                   "see a sublist)"),
+                                   "wildcard \"*\" in option to see a sublist)"),
                                  gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                                  argv[i]);
             }
@@ -7070,12 +7069,12 @@ command_init ()
            "freenode.#weechat\")\n"
            "         - \"*\" means all buffers\n"
            "         - a name starting with '!' is excluded\n"
-           "         - name can start or end with '*' to match many buffers\n"
+           "         - wildcard \"*\" is allowed\n"
            "   tags: comma separated list of tags, for example \"irc_join,"
            "irc_part,irc_quit\"\n"
            "         - logical \"and\": use \"+\" between tags (for example: "
            "\"nick_toto+irc_action\")\n"
-           "         - tags can start or end with '*'\n"
+           "         - wildcard \"*\" is allowed\n"
            "  regex: POSIX extended regular expression to search in line\n"
            "         - use '\\t' to separate prefix from message, special chars "
            "like '|' must be escaped: '\\|'\n"
@@ -7271,7 +7270,7 @@ command_init ()
            "   bar(xxx): bar \"xxx\"\n"
            "    item(*): any bar item\n"
            "  item(xxx): bar item \"xxx\"\n"
-           "The key can start or end with '*' to match many mouse events.\n"
+           "Wildcard \"*\" is allowed in key to match many mouse events.\n"
            "A special value for command with format \"hsignal:name\" can be "
            "used for context mouse, this will send the hsignal \"name\" with "
            "the focus hashtable as argument.\n"
@@ -7591,8 +7590,7 @@ command_init ()
         NULL, "set",
         N_("set config options"),
         N_("[<option> [<value>]] || diff [<option> [<option>...]]"),
-        N_("option: name of an option (can start or end with '*' to list many "
-           "options)\n"
+        N_("option: name of an option (wildcard \"*\" is allowed)\n"
            " value: new value for option\n"
            "  diff: display only changed options\n"
            "\n"
@@ -7621,8 +7619,8 @@ command_init ()
         NULL, "unset",
         N_("unset/reset config options"),
         N_("<option>"),
-        N_("option: name of an option (may begin or end with \"*\" to "
-           "mass-reset options, use carefully!)\n"
+        N_("option: name of an option (wildcard \"*\" is allowed to mass-reset "
+           "options, use carefully!)\n"
            "\n"
            "According to option, it's reset (for standard options) or removed "
            "(for optional settings, like server values).\n"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index a9afde63f..e6a4abd24 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -2289,11 +2289,11 @@ config_weechat_init_options ()
         weechat_config_file, ptr_section,
         "highlight_tags", "string",
         N_("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\""),
+           "comparison; wildcard \"*\" is allowed in each 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\""),
         NULL, 0, 0, "", NULL, 0, NULL, NULL, &config_change_highlight_tags, NULL, NULL, NULL);
     config_look_hotlist_add_conditions = config_file_new_option (
         weechat_config_file, ptr_section,
@@ -3324,8 +3324,8 @@ config_weechat_init_options ()
         N_("comma separated list of plugins to load automatically "
            "at startup, \"*\" means all plugins found, a name beginning with "
            "\"!\" is a negative value to prevent a plugin from being loaded, "
-           "names can start or end with \"*\" to match several plugins "
-           "(examples: \"*\" or \"*,!lua,!tcl\")"),
+           "wildcard \"*\" is allowed in names (examples: \"*\" or "
+           "\"*,!lua,!tcl\")"),
         NULL, 0, 0, "*", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_plugin_debug = config_file_new_option (
         weechat_config_file, ptr_section,
diff --git a/src/core/wee-string.c b/src/core/wee-string.c
index 7dfcd3219..21a1fca4d 100644
--- a/src/core/wee-string.c
+++ b/src/core/wee-string.c
@@ -363,7 +363,8 @@ string_strcasestr (const char *string, const char *search)
 /*
  * Checks if a string matches a mask.
  *
- * Mask can begin or end with "*", no other "*" are allowed inside mask.
+ * The mask can contain wildcards ("*"), each wildcard matches 0 or more chars
+ * in the string.
  *
  * Returns:
  *   1: string matches mask
@@ -373,78 +374,92 @@ string_strcasestr (const char *string, const char *search)
 int
 string_match (const char *string, const char *mask, int case_sensitive)
 {
-    char last, *mask2;
-    int len_string, len_mask, rc;
+    const char *ptr_string, *ptr_mask, *pos_word, *pos_end;
+    char *word;
+    int wildcard, length_word;
 
-    if (!mask || !mask[0])
+    if (!string || !mask || !mask[0])
         return 0;
 
-    /* if mask is "*", then any string matches */
-    if (strcmp (mask, "*") == 0)
+    ptr_string = string;
+    ptr_mask = mask;
+
+    while (ptr_mask[0])
+    {
+        wildcard = 0;
+
+        /* if we are on a wildcard, set the wildcard flag and skip it */
+        if (ptr_mask[0] == '*')
+        {
+            wildcard = 1;
+            ptr_mask++;
+            while (ptr_mask[0] == '*')
+            {
+                ptr_mask++;
+            }
+            if (!ptr_mask[0])
+                return 1;
+        }
+
+        /* no match if some mask without string */
+        if (!string[0])
+            return 0;
+
+        /* search the next wildcard (after the word) */
+        pos_end = strchr (ptr_mask, '*');
+
+        /* extract the word before the wildcard (or the end of mask) */
+        if (pos_end)
+        {
+            length_word = pos_end - ptr_mask;
+        }
+        else
+        {
+            length_word = strlen (ptr_mask);
+            pos_end = ptr_mask + length_word;
+        }
+        word = string_strndup (ptr_mask, length_word);
+        if (!word)
+            return 0;
+
+        /* check if the word is matching */
+        if (wildcard)
+        {
+            /* search the word anywhere in the string (from current position) */
+            pos_word = (case_sensitive) ?
+                strstr (ptr_string, word) : string_strcasestr (ptr_string, word);
+            if (!pos_word)
+            {
+                free (word);
+                return 0;
+            }
+            ptr_string = pos_word + length_word;
+        }
+        else
+        {
+            /* check if word is at beginning of string */
+            if ((case_sensitive
+                 && (strncmp (ptr_string, word, length_word) != 0))
+                || (!case_sensitive
+                    && (string_strncasecmp (ptr_string, word,
+                                            utf8_strlen (word)) != 0)))
+            {
+                free (word);
+                return 0;
+            }
+            ptr_string += length_word;
+        }
+
+        free (word);
+
+        ptr_mask = pos_end;
+    }
+
+    /* match if no more string/mask */
+    if (!ptr_string[0] && !ptr_mask[0])
         return 1;
 
-    len_string = strlen (string);
-    len_mask = strlen (mask);
-
-    last = mask[len_mask - 1];
-
-    /* mask begins with "*" */
-    if ((mask[0] == '*') && (last != '*'))
-    {
-        /* not enough chars in string to match */
-        if (len_string < len_mask - 1)
-            return 0;
-        /* check if end of string matches */
-        if ((case_sensitive && (strcmp (string + len_string - (len_mask - 1),
-                                        mask + 1) == 0))
-            || (!case_sensitive && (string_strcasecmp (string + len_string - (len_mask - 1),
-                                                       mask + 1) == 0)))
-            return 1;
-        /* no match */
-        return 0;
-    }
-
-    /* mask ends with "*" */
-    if ((mask[0] != '*') && (last == '*'))
-    {
-        /* not enough chars in string to match */
-        if (len_string < len_mask - 1)
-            return 0;
-        /* check if beginning of string matches */
-        if ((case_sensitive && (strncmp (string, mask, len_mask - 1) == 0))
-            || (!case_sensitive && (string_strncasecmp (string,
-                                                        mask,
-                                                        len_mask - 1) == 0)))
-            return 1;
-        /* no match */
-        return 0;
-    }
-
-    /* mask begins and ends with "*" */
-    if ((mask[0] == '*') && (last == '*'))
-    {
-        /* not enough chars in string to match */
-        if (len_string < len_mask - 2)
-            return 0;
-        /* keep only relevant chars in mask for searching string */
-        mask2 = string_strndup (mask + 1, len_mask - 2);
-        if (!mask2)
-            return 0;
-        /* search string */
-        rc = ((case_sensitive && strstr (string, mask2))
-              || (!case_sensitive && string_strcasestr (string, mask2))) ?
-            1 : 0;
-        /* free and return */
-        free (mask2);
-        return rc;
-    }
-
-    /* no "*" at all, compare strings */
-    if ((case_sensitive && (strcmp (string, mask) == 0))
-        || (!case_sensitive && (string_strcasecmp (string, mask) == 0)))
-        return 1;
-
-    /* no match */
+    /* no match in other cases */
     return 0;
 }
 
diff --git a/src/plugins/alias/alias-info.c b/src/plugins/alias/alias-info.c
index 22191e6e7..f4204bb98 100644
--- a/src/plugins/alias/alias-info.c
+++ b/src/plugins/alias/alias-info.c
@@ -94,6 +94,6 @@ alias_info_init ()
 {
     weechat_hook_infolist ("alias", N_("list of aliases"),
                            N_("alias pointer (optional)"),
-                           N_("alias name (can start or end with \"*\" as wildcard) (optional)"),
+                           N_("alias name (wildcard \"*\" is allowed) (optional)"),
                            &alias_info_get_infolist_cb, NULL);
 }
diff --git a/src/plugins/alias/alias.c b/src/plugins/alias/alias.c
index e1a1150bf..fad87ab7b 100644
--- a/src/plugins/alias/alias.c
+++ b/src/plugins/alias/alias.c
@@ -991,8 +991,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
            "is done with target command)\n"
            "            note: you can use %%command to use completion of an "
            "existing command\n"
-           "     alias: name of alias (can start or end with \"*\" for alias "
-           "listing)\n"
+           "     alias: name of alias (wildcard \"*\" is allowed)\n"
            "   command: command name with arguments (many commands can be "
            "separated by semicolons)\n"
            "\n"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 3e619c697..b56371486 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -166,8 +166,7 @@ irc_command_mode_nicks (struct t_irc_server *server,
                 if (set[0] == '-'
                     && (mode[0] == 'o' || mode[0] == 'h')
                     && argv[i][0]
-                    && ((argv[i][0] == '*')
-                        || (argv[i][strlen (argv[i]) - 1] == '*'))
+                    && strchr (argv[i], '*')
                     && (strcmp (server->nick, ptr_nick->name) == 0))
                 {
                     continue;
@@ -5730,8 +5729,7 @@ irc_command_init ()
         N_("[-current] [-exclude=<channel>[,<channel>...]] <command> "
            "[<arguments>]"),
         N_(" -current: execute command for channels of current server only\n"
-           " -exclude: exclude some channels ('*' is allowed at beginning or "
-           "end of channel name, to exclude many channels)\n"
+           " -exclude: exclude some channels (wildcard \"*\" is allowed)\n"
            "  command: command to execute\n"
            "arguments: arguments for command (special variables $nick, $channel "
            "and $server are replaced by their value)\n"
@@ -5752,8 +5750,7 @@ irc_command_init ()
            "[<arguments>]"),
         N_(" -current: execute command for private buffers of current server "
            "only\n"
-           " -exclude: exclude some nicks ('*' is allowed at beginning or "
-           "end of nick name, to exclude many nicks)\n"
+           " -exclude: exclude some nicks (wildcard \"*\" is allowed)\n"
            "  command: command to execute\n"
            "arguments: arguments for command (special variables $nick, $channel "
            "and $server are replaced by their value)\n"
@@ -5774,8 +5771,7 @@ irc_command_init ()
         N_("execute a command on all connected servers"),
         N_("[-exclude=<server>[,<server>...]] "
            "<command> [<arguments>]"),
-        N_(" -exclude: exclude some servers ('*' is allowed at beginning or end "
-           "of server name, to exclude many servers)\n"
+        N_(" -exclude: exclude some servers (wildcard \"*\" is allowed)\n"
            "  command: command to execute\n"
            "arguments: arguments for command (special variables $nick, $channel "
            "and $server are replaced by their value)\n"
@@ -5871,7 +5867,7 @@ irc_command_init ()
         "dehalfop",
         N_("remove channel half-operator status from nick(s)"),
         N_("<nick> [<nick>...]"),
-        N_("nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+        N_("nick: nick or mask (wildcard \"*\" is allowed)\n"
            "   *: remove channel half-operator status from everybody on channel "
            "except yourself"),
         "%(nicks)", &irc_command_dehalfop, NULL);
@@ -5879,7 +5875,7 @@ irc_command_init ()
         "deop",
         N_("remove channel operator status from nick(s)"),
         N_("<nick> [<nick>...] || * -yes"),
-        N_("nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+        N_("nick: nick or mask (wildcard \"*\" is allowed)\n"
            "   *: remove channel operator status from everybody on channel "
            "except yourself"),
         "%(nicks)|%*", &irc_command_deop, NULL);
@@ -5887,7 +5883,7 @@ irc_command_init ()
         "devoice",
         N_("remove voice from nick(s)"),
         N_("<nick> [<nick>...] || * -yes"),
-        N_("nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+        N_("nick: nick or mask (wildcard \"*\" is allowed)\n"
            "   *: remove voice from everybody on channel"),
         "%(nicks)|%*", &irc_command_devoice, NULL);
     weechat_hook_command (
@@ -5911,7 +5907,7 @@ irc_command_init ()
         "halfop",
         N_("give channel half-operator status to nick(s)"),
         N_("<nick> [<nick>...] || * -yes"),
-        N_("nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+        N_("nick: nick or mask (wildcard \"*\" is allowed)\n"
            "   *: give channel half-operator status to everybody on channel"),
         "%(nicks)", &irc_command_halfop, NULL);
     weechat_hook_command (
@@ -6166,7 +6162,7 @@ irc_command_init ()
         "op",
         N_("give channel operator status to nick(s)"),
         N_("<nick> [<nick>...] || * -yes"),
-        N_("nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+        N_("nick: nick or mask (wildcard \"*\" is allowed)\n"
            "   *: give channel operator status to everybody on channel"),
         "%(nicks)|%*", &irc_command_op, NULL);
     weechat_hook_command (
@@ -6433,7 +6429,7 @@ irc_command_init ()
         "voice",
         N_("give voice to nick(s)"),
         N_("<nick> [<nick>...]"),
-        N_("nick: nick or mask (can start or end with \"*\" as wildcard)\n"
+        N_("nick: nick or mask (wildcard \"*\" is allowed)\n"
            "   *: give voice to everybody on channel"),
         "%(nicks)|%*", &irc_command_voice, NULL);
     weechat_hook_command (
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index d034e2541..970eb738d 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -2406,9 +2406,8 @@ irc_config_init ()
         N_("restrict highlights to these tags on irc buffers (to have "
            "highlight on user messages but not server messages); tags "
            "must be separated by a comma and \"+\" can be used to make a "
-           "logical \"and\" between tags; tags can start or end with \"*\" "
-           "to match more than one tag; an empty value allows highlight on any "
-           "tag"),
+           "logical \"and\" between tags; wildcard \"*\" is allowed in tags; "
+           "an empty value allows highlight on any tag"),
         NULL, 0, 0, "irc_privmsg,irc_notice", NULL, 0, NULL, NULL,
         &irc_config_change_look_highlight_tags_restrict, NULL, NULL, NULL);
     irc_config_look_item_away_message = weechat_config_new_option (
diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c
index 066415a1d..36a519d10 100644
--- a/src/plugins/irc/irc-info.c
+++ b/src/plugins/irc/irc-info.c
@@ -640,7 +640,7 @@ irc_info_init ()
     weechat_hook_infolist ("irc_server",
                            N_("list of IRC servers"),
                            N_("server pointer (optional)"),
-                           N_("server name (can start or end with \"*\" as wildcard) (optional)"),
+                           N_("server name (wildcard \"*\" is allowed) (optional)"),
                            &irc_info_get_infolist_cb, NULL);
     weechat_hook_infolist ("irc_channel",
                            N_("list of channels for an IRC server"),
@@ -660,7 +660,7 @@ irc_info_init ()
     weechat_hook_infolist ("irc_notify",
                            N_("list of notify"),
                            N_("notify pointer (optional)"),
-                           N_("server name (can start or end with \"*\" as wildcard) (optional)"),
+                           N_("server name (wildcard \"*\" is allowed) (optional)"),
                            &irc_info_get_infolist_cb, NULL);
 
     /* hdata hooks */
diff --git a/src/plugins/plugin-api.c b/src/plugins/plugin-api.c
index 450e18238..c3ea57569 100644
--- a/src/plugins/plugin-api.c
+++ b/src/plugins/plugin-api.c
@@ -1214,11 +1214,11 @@ plugin_api_init ()
     /* WeeChat core infolist hooks */
     hook_infolist (NULL, "bar", N_("list of bars"),
                    N_("bar pointer (optional)"),
-                   N_("bar name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("bar name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "bar_item", N_("list of bar items"),
                    N_("bar item pointer (optional)"),
-                   N_("bar item name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("bar item name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "bar_window", N_("list of bar windows"),
                    N_("bar window pointer (optional)"),
@@ -1226,7 +1226,7 @@ plugin_api_init ()
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "buffer", N_("list of buffers"),
                    N_("buffer pointer (optional)"),
-                   N_("buffer name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("buffer name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "buffer_lines", N_("lines of a buffer"),
                    N_("buffer pointer"),
@@ -1234,7 +1234,7 @@ plugin_api_init ()
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "filter", N_("list of filters"),
                    NULL,
-                   N_("filter name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("filter name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "history", N_("history of commands"),
                    N_("buffer pointer (if not set, return global history) (optional)"),
@@ -1243,8 +1243,8 @@ plugin_api_init ()
     hook_infolist (NULL, "hook", N_("list of hooks"),
                    N_("hook pointer (optional)"),
                    N_("type,arguments (type is command/timer/.., arguments to "
-                      "get only some hooks (can start or end with \"*\" as "
-                      "wildcard), both are optional)"),
+                      "get only some hooks (wildcard \"*\" is allowed), "
+                      "both are optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "hotlist", N_("list of buffers in hotlist"),
                    NULL,
@@ -1266,15 +1266,15 @@ plugin_api_init ()
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "option", N_("list of options"),
                    NULL,
-                   N_("option name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("option name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "plugin", N_("list of plugins"),
                    N_("plugin pointer (optional)"),
-                   N_("plugin name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("plugin name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "proxy", N_("list of proxies"),
                    N_("proxy pointer (optional)"),
-                   N_("proxy name (can start or end with \"*\" as wildcard) (optional)"),
+                   N_("proxy name (wildcard \"*\" is allowed) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "url_options", N_("options for URL"),
                    NULL,
diff --git a/src/plugins/plugin-script.c b/src/plugins/plugin-script.c
index fe80aecac..bffe58e75 100644
--- a/src/plugins/plugin-script.c
+++ b/src/plugins/plugin-script.c
@@ -193,7 +193,7 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin,
                             init->callback_hdata, weechat_plugin);
         weechat_hook_infolist (string, N_("list of scripts"),
                                N_("script pointer (optional)"),
-                               N_("script name (can start or end with \"*\" as wildcard) (optional)"),
+                               N_("script name (wildcard \"*\" is allowed) (optional)"),
                                init->callback_infolist, NULL);
         snprintf (string, length, "%s_callback", weechat_plugin->name);
         weechat_hook_hdata (string, N_("callback of a script"),
diff --git a/src/plugins/script/script-info.c b/src/plugins/script/script-info.c
index aec302b26..6c706ad05 100644
--- a/src/plugins/script/script-info.c
+++ b/src/plugins/script/script-info.c
@@ -99,7 +99,8 @@ script_info_init ()
     weechat_hook_infolist ("script_script",
                            N_("list of scripts"),
                            N_("script pointer (optional)"),
-                           N_("script name with extension (can start or end with \"*\" as wildcard) (optional)"),
+                           N_("script name with extension "
+                              "(wildcard \"*\" is allowed) (optional)"),
                            &script_info_get_infolist_cb, NULL);
 
     /* hdata hooks */
diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c
index fb42c14ab..56954bdc8 100644
--- a/src/plugins/trigger/trigger-command.c
+++ b/src/plugins/trigger/trigger-command.c
@@ -1004,7 +1004,7 @@ trigger_command_init ()
            "    monitor: open the trigger monitor buffer, with optional filter:\n"
            "     filter: filter hooks/triggers to display (a hook must start "
            "with \"@\", for example \"@signal\"), many filters can be separated "
-           "by commas; each trigger name can start or end with \"*\"\n"
+           "by commas; wildcard \"*\" is allowed in each trigger name\n"
            "\n"
            "When a trigger callback is called, following actions are performed, "
            "in this order:\n"