23 files changed, 200 insertions, 148 deletions
diff --git a/ChangeLog b/ChangeLog
index fbf1ed6eb..e80c35073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@ Version 0.3.2 (2010-04-18)
 * core: add command line option "-s" (or "--no-script") to start WeeChat
   without loading any script
 * core: improve plugins autoload (option weechat.plugin.autoload): allow to
-  use "*" as joker and "!" to prevent a plugin from being autoloaded
+  use "*" as wildcard and "!" to prevent a plugin from being autoloaded
   (task #6361)
 * core: remove unneeded space after time on each line if option
   weechat.look.buffer_time_format is set to empty value (bug #28751)
diff --git a/doc/en/autogen/plugin_api/infolists.txt b/doc/en/autogen/plugin_api/infolists.txt
index c49bb5bbb..c734fc2a4 100644
--- a/doc/en/autogen/plugin_api/infolists.txt
+++ b/doc/en/autogen/plugin_api/infolists.txt
@@ -2,7 +2,7 @@
 |========================================
 | Plugin | Name | Description | Pointer | Arguments
 
-| alias | alias | list of aliases | alias pointer (optional) | alias name (can start or end with "*" as joker) (optional)
+| alias | alias | list of aliases | alias pointer (optional) | alias name (can start or end with "*" as wildcard) (optional)
 
 | irc | irc_channel | list of channels for an IRC server | channel pointer (optional) | server name
 
@@ -10,33 +10,33 @@
 
 | irc | irc_nick | list of nicks for an IRC channel | nick pointer (optional) | server,channel,nick (channel and nick are optional)
 
-| irc | irc_server | list of IRC servers | server pointer (optional) | server name (can start or end with "*" as joker) (optional)
+| irc | irc_server | list of IRC servers | server pointer (optional) | server name (can start or end with "*" as wildcard) (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 joker) (optional)
+| lua | lua_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 (can start or end with "*" as joker) (optional)
+| perl | perl_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 (can start or end with "*" as joker) (optional)
+| python | python_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (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 joker) (optional)
+| ruby | ruby_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 (can start or end with "*" as joker) (optional)
+| tcl | tcl_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)
 
-| weechat | bar | list of bars | bar pointer (optional) | bar name (can start or end with "*" as joker) (optional)
+| weechat | bar | list of bars | bar pointer (optional) | bar name (can start or end with "*" as wildcard) (optional)
 
-| weechat | bar_item | list of bar items | bar item pointer (optional) | bar item name (can start or end with "*" as joker) (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_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 joker) (optional)
+| weechat | buffer | list of buffers | buffer pointer (optional) | buffer name (can start or end with "*" as wildcard) (optional)
 
 | weechat | buffer_lines | lines of a buffer | buffer pointer | -
 
-| weechat | filter | list of filters | - | filter name (can start or end with "*" as joker) (optional)
+| weechat | filter | list of filters | - | filter name (can start or end with "*" as wildcard) (optional)
 
 | weechat | history | history of commands | buffer pointer (if not set, return global history) (optional) | -
 
@@ -48,11 +48,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 joker) (optional)
+| weechat | option | list of options | - | option name (can start or end with "*" as wildcard) (optional)
 
-| weechat | plugin | list of plugins | plugin pointer (optional) | plugin name (can start or end with "*" as joker) (optional)
+| weechat | plugin | list of plugins | plugin pointer (optional) | plugin name (can start or end with "*" as wildcard) (optional)
 
-| weechat | window | list of windows | window pointer (optional) | window name (can start or end with "*" as joker) (optional)
+| weechat | window | list of windows | window pointer (optional) | window name (can start or end with "*" as wildcard) (optional)
 
 | xfer | xfer | list of xfer | xfer pointer (optional) | -
 
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index eacd03c29..20e731906 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -5072,7 +5072,7 @@ struct t_hook *weechat_hook_command_run (const char *command,
 
 Arguments:
 
-* 'command': command to hook, can start or end with "*" as joker
+* 'command': command to hook, can start or end with "*" as wildcard
 * 'callback': function called when command is run, arguments:
 ** 'void *data': pointer
 ** 'struct t_gui_buffer *buffer': buffer where command is executed
diff --git a/doc/it/autogen/plugin_api/infolists.txt b/doc/it/autogen/plugin_api/infolists.txt
index b26d2f8c5..6935e1ae7 100644
--- a/doc/it/autogen/plugin_api/infolists.txt
+++ b/doc/it/autogen/plugin_api/infolists.txt
@@ -2,7 +2,7 @@
 |========================================
 | 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 (can start or end with "*" as wildcard) (optional)
 
 | irc | irc_channel | elenco dei canali per un server IRC | puntatore al canale (opzionale) | nome server
 
@@ -10,33 +10,33 @@
 
 | irc | irc_nick | elenco dei nick per un canale IRC | puntatore al nick (opzionale) | server,canale,nick (canale e nick sono opzionali)
 
-| irc | irc_server | elenco di server IRC | puntatore al server (opzionale) | nome server (può iniziare o terminare con "*" come carattere jolly)
+| irc | irc_server | elenco di server IRC | puntatore al server (opzionale) | server name (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (optional)
 
 | weechat | history | cronologia dei comandi | puntatore al buffer (se non impostato, restituisce la cronologia globale) (opzionale) | -
 
@@ -48,11 +48,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 (can start or end with "*" as wildcard) (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 (can start or end with "*" as wildcard) (optional)
 
-| weechat | window | elenco delle finestre | puntatore alla finestra (opzionale) | nome finestra (può iniziare o terminare con "*" come carattere jolly) (opzionale)
+| weechat | window | elenco delle finestre | puntatore alla finestra (opzionale) | window name (can start or end with "*" as wildcard) (optional)
 
 | xfer | xfer | lista di xfer | puntatore a xfer (opzionale) | -
 
diff --git a/po/cs.po b/po/cs.po
index 054f2ffee..e114e21b7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:50+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2669,7 +2669,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 joker) (optional)"
+#, fuzzy
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno aliasu (může začínat nebo končit \"*\") (volitelné)"
 
 #, c-format
@@ -4660,7 +4661,8 @@ msgstr "seznam IRC serverů"
 msgid "server pointer (optional)"
 msgstr "ukayatel serveru (volitelný)"
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno serveru (může začínat nebo končit s \"*\") (volitelné)"
 
 msgid "list of channels for an IRC server"
@@ -5494,7 +5496,8 @@ msgstr "seznam polí"
 msgid "bar pointer (optional)"
 msgstr "ukazatel pole (volitelný)"
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno pole (může začínat nebo končit \"*\") (volitelné)"
 
 msgid "list of bar items"
@@ -5503,7 +5506,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 joker) (optional)"
+#, fuzzy
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno položky pole (může začínat nebo končit \"*\") (volitelné)"
 
 msgid "list of bar windows"
@@ -5518,7 +5522,8 @@ msgstr "seznam bufferů"
 msgid "buffer pointer (optional)"
 msgstr "ukazatel bufferu (volitelný)"
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno buferu (může začínat nebo končit \"*\") (volitelné)"
 
 msgid "lines of a buffer"
@@ -5530,7 +5535,8 @@ msgstr "ukazatel bufferu"
 msgid "list of filters"
 msgstr "seznam filtrů"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno filtru (může začínat nebo končit \"*\") (volitelné)"
 
 msgid "history of commands"
@@ -5563,7 +5569,8 @@ msgstr ""
 msgid "list of options"
 msgstr "seznam konfiguračních možností"
 
-msgid "option name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno volby (může začínat nebo končit \"*\") (volitelné)"
 
 msgid "list of plugins"
@@ -5572,7 +5579,8 @@ msgstr "seznam pluginů"
 msgid "plugin pointer (optional)"
 msgstr "ukazatel pluginu (volitelný)"
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno pluginu (může začínat nebo končit \"*\") (volitelné)"
 
 msgid "list of windows"
@@ -5581,7 +5589,8 @@ msgstr "seznam oken"
 msgid "window pointer (optional)"
 msgstr "ukazatel okna (volitelné)"
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno okna (může začínat nebo končit \"*\") (volitelné)"
 
 #, c-format
@@ -6019,7 +6028,8 @@ msgstr "seznam skriptů"
 msgid "script pointer (optional)"
 msgstr "ukazatel skriptu (volitelný)"
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "jméno skriptu (může začínat nebo končit \"*\") (volitelné)"
 
 #, c-format
diff --git a/po/de.po b/po/de.po
index aa459ace3..80fcf1b2c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:50+0200\n"
 "Last-Translator: Nils G <weechatter@arcor.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2773,7 +2773,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "Alias Pointer (optional)"
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "Alias Name (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
 #, c-format
@@ -4835,7 +4836,8 @@ msgstr "Liste der IRC-Server"
 msgid "server pointer (optional)"
 msgstr "Server Pointer (optional)"
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "Servername (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
 msgid "list of channels for an IRC server"
@@ -5683,7 +5685,8 @@ msgstr "Auflistung der Bars"
 msgid "bar pointer (optional)"
 msgstr "Bar Pointer (optional)"
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "Bar Name (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
 msgid "list of bar items"
@@ -5692,7 +5695,8 @@ msgstr "Liste der Bar-Items"
 msgid "bar item pointer (optional)"
 msgstr "Bar Item Pointer (optional)"
 
-msgid "bar item name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "Bar-Item Name (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
@@ -5708,7 +5712,8 @@ msgstr "Liste der Buffer"
 msgid "buffer pointer (optional)"
 msgstr "Buffer Pointer (optional)"
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "Buffername (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
 msgid "lines of a buffer"
@@ -5720,7 +5725,8 @@ msgstr "Buffer Pointer"
 msgid "list of filters"
 msgstr "Liste der Filter"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "Filtername (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
 msgid "history of commands"
@@ -5753,7 +5759,8 @@ msgstr ""
 msgid "list of options"
 msgstr "Liste der Optionen"
 
-msgid "option name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "Name einer Option (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
@@ -5763,7 +5770,8 @@ msgstr "Auflistung der Erweiterungen"
 msgid "plugin pointer (optional)"
 msgstr "Pointer der Erweiterung (optional)"
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "Name einer Erweiterung (darf mit einem Joker \"*\" beginnen oder enden) "
 "(optional)"
@@ -5774,7 +5782,8 @@ msgstr "Auflistung der Windows"
 msgid "window pointer (optional)"
 msgstr "Fenster Pointer (optional)"
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "Fenstername (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
@@ -6224,7 +6233,8 @@ msgstr "Liste der Skripten:"
 msgid "script pointer (optional)"
 msgstr "Skript Pointer (optional)"
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "Name des Skripts (darf mit einem Joker \"*\" beginnen oder enden) (optional)"
 
diff --git a/po/es.po b/po/es.po
index 8637305ad..9c8cc26a4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:50+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2713,7 +2713,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "puntero del alias (opcional)"
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del alias (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
@@ -4729,7 +4730,8 @@ msgstr "lista de servidores IRC"
 msgid "server pointer (optional)"
 msgstr "puntero del servidor (opcional)"
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del servidor (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -5574,7 +5576,8 @@ msgstr "lista de barras"
 msgid "bar pointer (optional)"
 msgstr "puntero de la barra (opcional)"
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre de barra (puede empezar o terminar con \"*\" como comodín) (opcional)"
 
@@ -5584,7 +5587,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 joker) (optional)"
+#, fuzzy
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del elemento de barra (puede empezar o terminar con \"*\" como "
 "comodín) (opcional)"
@@ -5601,7 +5605,8 @@ msgstr "lista de buffers"
 msgid "buffer pointer (optional)"
 msgstr "puntero del buffer (opcional)"
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del buffer (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -5615,7 +5620,8 @@ msgstr "puntero del buffer"
 msgid "list of filters"
 msgstr "lista de filtros"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del filtro (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -5649,7 +5655,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 joker) (optional)"
+#, fuzzy
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre de la opción (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -5660,7 +5667,8 @@ msgstr "lista de plugins"
 msgid "plugin pointer (optional)"
 msgstr "puntero del plugin (opcional)"
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del plugin (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -5671,7 +5679,8 @@ msgstr "lista de ventanas"
 msgid "window pointer (optional)"
 msgstr "puntero de la ventana (opcional)"
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre de la ventana (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
@@ -6119,7 +6128,8 @@ msgstr "lista de scripts"
 msgid "script pointer (optional)"
 msgstr "puntero del script (opcional)"
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nombre del script (puede empezar o terminar con \"*\" como comodín) "
 "(opcional)"
diff --git a/po/fr.po b/po/fr.po
index da41b08c5..c3823bc79 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
-"PO-Revision-Date: 2010-04-18 10:50+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
+"PO-Revision-Date: 2010-04-18 15:18+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2735,7 +2735,7 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "pointeur vers l'alias (optionnel)"
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+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)"
 
@@ -4764,7 +4764,7 @@ msgstr "liste des serveurs IRC"
 msgid "server pointer (optional)"
 msgstr "pointeur vers le serveur (optionnel)"
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+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)"
@@ -5603,7 +5603,7 @@ msgstr "liste des barres"
 msgid "bar pointer (optional)"
 msgstr "pointeur vers la barre (optionnel)"
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+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)"
 
@@ -5613,7 +5613,7 @@ 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 joker) (optional)"
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nom d'objet de barre (peut démarrer ou se terminer par \"*\" comme joker) "
 "(optionnel)"
@@ -5630,7 +5630,7 @@ msgstr "liste des tampons"
 msgid "buffer pointer (optional)"
 msgstr "pointeur vers le tampon (optionnel)"
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+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)"
@@ -5644,7 +5644,7 @@ msgstr "pointeur vers le tampon"
 msgid "list of filters"
 msgstr "liste des filtres"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+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)"
@@ -5679,7 +5679,7 @@ msgstr ""
 msgid "list of options"
 msgstr "liste des options"
 
-msgid "option name (can start or end with \"*\" as joker) (optional)"
+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)"
 
@@ -5689,7 +5689,7 @@ msgstr "liste des extensions"
 msgid "plugin pointer (optional)"
 msgstr "pointeur vers l'extension (optionnel)"
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+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)"
@@ -5700,7 +5700,7 @@ msgstr "liste des fenêtres"
 msgid "window pointer (optional)"
 msgstr "pointeur vers la fenêtre (optionnel)"
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nom de fenêtre (peut démarrer ou se terminer par \"*\" comme joker) "
 "(optionnel)"
@@ -6152,7 +6152,7 @@ msgstr "liste des scripts"
 msgid "script pointer (optional)"
 msgstr "pointeur vers le script (optionnel)"
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+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)"
diff --git a/po/hu.po b/po/hu.po
index f9c88c9d7..4556e4ad9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2538,7 +2538,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 joker) (optional)"
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy, c-format
@@ -4484,7 +4484,7 @@ msgstr "IRC szerver portja"
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5274,7 +5274,7 @@ msgstr "Aliaszok listája:\n"
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5284,7 +5284,7 @@ msgstr "Aliaszok listája:\n"
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as joker) (optional)"
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5301,7 +5301,7 @@ msgstr "Aliaszok listája:\n"
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5316,7 +5316,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 joker) (optional)"
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5352,7 +5352,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 joker) (optional)"
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5362,7 +5362,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 joker) (optional)"
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5372,7 +5372,7 @@ msgstr "Mellőzések listája:\n"
 msgid "window pointer (optional)"
 msgstr ""
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5813,7 +5813,7 @@ msgstr "Aliaszok listája:\n"
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, c-format
diff --git a/po/it.po b/po/it.po
index 38ff8d62b..deab4a719 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weechat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2712,7 +2712,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "puntatore all'alias (opzionale)"
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome alias (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -4735,7 +4736,8 @@ msgstr "elenco di server IRC"
 msgid "server pointer (optional)"
 msgstr "puntatore al server (opzionale)"
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nome server (può iniziare o terminare con \"*\" come carattere jolly)"
 
 msgid "list of channels for an IRC server"
@@ -5570,7 +5572,8 @@ msgstr "elenco delle barre"
 msgid "bar pointer (optional)"
 msgstr "puntatore alla barra (opzionale)"
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome barra (può iniziare o terminare con \"*\" come carattere jolly "
 "(opzionale)"
@@ -5581,7 +5584,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 joker) (optional)"
+#, fuzzy
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome dell'elemento della barra (può iniziare o terminare con \"*\" come "
 "carattere jolly) (opzionale)"
@@ -5598,7 +5602,8 @@ msgstr "elenco dei buffer"
 msgid "buffer pointer (optional)"
 msgstr "puntatore al buffer (opzionale)"
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome buffer (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -5612,7 +5617,8 @@ msgstr "puntatore al buffer"
 msgid "list of filters"
 msgstr "elenco dei filtri"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome filtro (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -5646,7 +5652,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 joker) (optional)"
+#, fuzzy
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome opzione (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -5657,7 +5664,8 @@ msgstr "elenco dei plugin"
 msgid "plugin pointer (optional)"
 msgstr "puntatore al plugin (opzionale)"
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome plugin (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -5668,7 +5676,8 @@ msgstr "elenco delle finestre"
 msgid "window pointer (optional)"
 msgstr "puntatore alla finestra (opzionale)"
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome finestra (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
@@ -6113,7 +6122,8 @@ msgstr "elenco degli script"
 msgid "script pointer (optional)"
 msgstr "puntatore allo script (opzionale)"
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nome script (può iniziare o terminare con \"*\" come carattere jolly) "
 "(opzionale)"
diff --git a/po/pl.po b/po/pl.po
index f10198677..d82327e2a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #, c-format
 msgid ""
@@ -2707,7 +2708,8 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr "wskaźnik aliasu (opcjonalny)"
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa aliasu (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 #, c-format
@@ -4708,7 +4710,8 @@ msgstr "lista serwerów IRC"
 msgid "server pointer (optional)"
 msgstr "wskaźnik serwera (opcjonalny)"
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa serwera (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of channels for an IRC server"
@@ -5537,7 +5540,8 @@ msgstr "lista pasków"
 msgid "bar pointer (optional)"
 msgstr "wskaźnik paska (opcjonalne)"
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa paska (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of bar items"
@@ -5546,7 +5550,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 joker) (optional)"
+#, fuzzy
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 "nazwa elementu paska (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
@@ -5562,7 +5567,8 @@ msgstr "lista buforów"
 msgid "buffer pointer (optional)"
 msgstr "wzkaźnik bufora (opcjonalne)"
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa bufora (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "lines of a buffer"
@@ -5574,7 +5580,8 @@ msgstr "wskaźnik bufora"
 msgid "list of filters"
 msgstr "lista filtrów"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa filtru (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "history of commands"
@@ -5606,7 +5613,8 @@ msgstr ""
 msgid "list of options"
 msgstr "lista opcji"
 
-msgid "option name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa opcji (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of plugins"
@@ -5615,7 +5623,8 @@ msgstr "lista wtyczek"
 msgid "plugin pointer (optional)"
 msgstr "wskaźnik wtyczki (opcjonalne)"
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa wtyczki (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 msgid "list of windows"
@@ -5624,7 +5633,8 @@ msgstr "lista okien"
 msgid "window pointer (optional)"
 msgstr "wskaźnik okna (opcjonalne)"
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa okna (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 #, c-format
@@ -6067,7 +6077,8 @@ msgstr "lista skryptów"
 msgid "script pointer (optional)"
 msgstr "wskaźnik skryptu (opcjonalne)"
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+#, fuzzy
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr "nazwa skryptu (może się zaczynać lub kończyć \"*\") (opcjonalne)"
 
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 7b4c01ea3..09d38ab84 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"
 
 #, c-format
@@ -2548,7 +2549,7 @@ msgstr "%s параметр конфигурации \"%s\" не найден\n"
 msgid "alias pointer (optional)"
 msgstr "настроить параметры конфигурации"
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy, c-format
@@ -4485,7 +4486,7 @@ msgstr "порт IRC сервера"
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5277,7 +5278,7 @@ msgstr "Список сокращений:\n"
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5287,7 +5288,7 @@ msgstr "Список сокращений:\n"
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as joker) (optional)"
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5304,7 +5305,7 @@ msgstr "Список сокращений:\n"
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5319,7 +5320,7 @@ msgstr "поиск текста в истории буфера"
 msgid "list of filters"
 msgstr "Список сокращений:\n"
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5355,7 +5356,7 @@ msgstr ""
 msgid "list of options"
 msgstr "настроить параметры конфигурации"
 
-msgid "option name (can start or end with \"*\" as joker) (optional)"
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5365,7 +5366,7 @@ msgstr "настроить параметры конфигурации"
 msgid "plugin pointer (optional)"
 msgstr ""
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy
@@ -5375,7 +5376,7 @@ msgstr "Список игнорирования:\n"
 msgid "window pointer (optional)"
 msgstr ""
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5815,7 +5816,7 @@ msgstr "Список сокращений:\n"
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, c-format
diff --git a/po/weechat.pot b/po/weechat.pot
index 3caf2f335..b44d154c7 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-18 09:21+0200\n"
+"POT-Creation-Date: 2010-04-18 15:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2178,7 +2178,7 @@ msgstr ""
 msgid "alias pointer (optional)"
 msgstr ""
 
-msgid "alias name (can start or end with \"*\" as joker) (optional)"
+msgid "alias name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, c-format
@@ -3836,7 +3836,7 @@ msgstr ""
 msgid "server pointer (optional)"
 msgstr ""
 
-msgid "server name (can start or end with \"*\" as joker) (optional)"
+msgid "server name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "list of channels for an IRC server"
@@ -4582,7 +4582,7 @@ msgstr ""
 msgid "bar pointer (optional)"
 msgstr ""
 
-msgid "bar name (can start or end with \"*\" as joker) (optional)"
+msgid "bar name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "list of bar items"
@@ -4591,7 +4591,7 @@ msgstr ""
 msgid "bar item pointer (optional)"
 msgstr ""
 
-msgid "bar item name (can start or end with \"*\" as joker) (optional)"
+msgid "bar item name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "list of bar windows"
@@ -4606,7 +4606,7 @@ msgstr ""
 msgid "buffer pointer (optional)"
 msgstr ""
 
-msgid "buffer name (can start or end with \"*\" as joker) (optional)"
+msgid "buffer name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "lines of a buffer"
@@ -4618,7 +4618,7 @@ msgstr ""
 msgid "list of filters"
 msgstr ""
 
-msgid "filter name (can start or end with \"*\" as joker) (optional)"
+msgid "filter name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "history of commands"
@@ -4648,7 +4648,7 @@ msgstr ""
 msgid "list of options"
 msgstr ""
 
-msgid "option name (can start or end with \"*\" as joker) (optional)"
+msgid "option name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "list of plugins"
@@ -4657,7 +4657,7 @@ msgstr ""
 msgid "plugin pointer (optional)"
 msgstr ""
 
-msgid "plugin name (can start or end with \"*\" as joker) (optional)"
+msgid "plugin name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 msgid "list of windows"
@@ -4666,7 +4666,7 @@ msgstr ""
 msgid "window pointer (optional)"
 msgstr ""
 
-msgid "window name (can start or end with \"*\" as joker) (optional)"
+msgid "window name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, c-format
@@ -5078,7 +5078,7 @@ msgstr ""
 msgid "script pointer (optional)"
 msgstr ""
 
-msgid "script name (can start or end with \"*\" as joker) (optional)"
+msgid "script name (can start or end with \"*\" as wildcard) (optional)"
 msgstr ""
 
 #, c-format
diff --git a/src/core/wee-string.c b/src/core/wee-string.c
index d454dbbbf..afdc05ed4 100644
--- a/src/core/wee-string.c
+++ b/src/core/wee-string.c
@@ -680,7 +680,7 @@ string_has_highlight (const char *string, const char *highlight_words)
 }
 
 /*
- * string_mask_to_regex: convert a mask (string with only "*" as joker) to a
+ * string_mask_to_regex: convert a mask (string with only "*" as wildcard) to a
  *                       regex, paying attention to special chars in a regex
  */
 
diff --git a/src/plugins/alias/alias-info.c b/src/plugins/alias/alias-info.c
index 5c5dcf28a..bbeffe1af 100644
--- a/src/plugins/alias/alias-info.c
+++ b/src/plugins/alias/alias-info.c
@@ -97,6 +97,6 @@ alias_info_init ()
     /* alias infolist hooks */
     weechat_hook_infolist ("alias", N_("list of aliases"),
                            N_("alias pointer (optional)"),
-                           N_("alias name (can start or end with \"*\" as joker) (optional)"),
+                           N_("alias name (can start or end with \"*\" as wildcard) (optional)"),
                            &alias_info_get_infolist_cb, NULL);
 }
diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c
index 710757eb6..54496830b 100644
--- a/src/plugins/irc/irc-info.c
+++ b/src/plugins/irc/irc-info.c
@@ -426,7 +426,7 @@ irc_info_init ()
     /* infolist hooks */
     weechat_hook_infolist ("irc_server", N_("list of IRC servers"),
                            N_("server pointer (optional)"),
-                           N_("server name (can start or end with \"*\" as joker) (optional)"),
+                           N_("server name (can start or end with \"*\" as wildcard) (optional)"),
                            &irc_info_get_infolist_cb, NULL);
     weechat_hook_infolist ("irc_channel", N_("list of channels for an IRC server"),
                            N_("channel pointer (optional)"),
diff --git a/src/plugins/plugin-api.c b/src/plugins/plugin-api.c
index 0375cf70d..82ba1a6e7 100644
--- a/src/plugins/plugin-api.c
+++ b/src/plugins/plugin-api.c
@@ -969,11 +969,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 joker) (optional)"),
+                   N_("bar name (can start or end with \"*\" as wildcard) (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 joker) (optional)"),
+                   N_("bar item name (can start or end with \"*\" as wildcard) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "bar_window", N_("list of bar windows"),
                    N_("bar window pointer (optional)"),
@@ -981,7 +981,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 joker) (optional)"),
+                   N_("buffer name (can start or end with \"*\" as wildcard) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "buffer_lines", N_("lines of a buffer"),
                    N_("buffer pointer"),
@@ -989,7 +989,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 joker) (optional)"),
+                   N_("filter name (can start or end with \"*\" as wildcard) (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)"),
@@ -1014,14 +1014,14 @@ 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 joker) (optional)"),
+                   N_("option name (can start or end with \"*\" as wildcard) (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 joker) (optional)"),
+                   N_("plugin name (can start or end with \"*\" as wildcard) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
     hook_infolist (NULL, "window", N_("list of windows"),
                    N_("window pointer (optional)"),
-                   N_("window name (can start or end with \"*\" as joker) (optional)"),
+                   N_("window name (can start or end with \"*\" as wildcard) (optional)"),
                    &plugin_api_infolist_get_internal, NULL);
 }
diff --git a/src/plugins/scripts/lua/weechat-lua-api.c b/src/plugins/scripts/lua/weechat-lua-api.c
index 5d4f68adc..41b099ce8 100644
--- a/src/plugins/scripts/lua/weechat-lua-api.c
+++ b/src/plugins/scripts/lua/weechat-lua-api.c
@@ -454,7 +454,7 @@ weechat_lua_api_string_has_highlight (lua_State *L)
 
 /*
  * weechat_lua_api_string_mask_to_regex: convert a mask (string with only
- *                                       "*" as joker) to a regex, paying
+ *                                       "*" as wildcard) to a regex, paying
  *                                       attention to special chars in a
  *                                       regex
  */
diff --git a/src/plugins/scripts/perl/weechat-perl-api.c b/src/plugins/scripts/perl/weechat-perl-api.c
index 04c51cb5f..e3a1bc733 100644
--- a/src/plugins/scripts/perl/weechat-perl-api.c
+++ b/src/plugins/scripts/perl/weechat-perl-api.c
@@ -384,7 +384,7 @@ XS (XS_weechat_api_string_has_highlight)
 
 /*
  * weechat::string_mask_to_regex: convert a mask (string with only "*" as
- *                                joker) to a regex, paying attention to
+ *                                wildcard) to a regex, paying attention to
  *                                special chars in a regex
  */
 
diff --git a/src/plugins/scripts/python/weechat-python-api.c b/src/plugins/scripts/python/weechat-python-api.c
index e8da86d78..561bafad5 100644
--- a/src/plugins/scripts/python/weechat-python-api.c
+++ b/src/plugins/scripts/python/weechat-python-api.c
@@ -396,7 +396,7 @@ weechat_python_api_string_has_highlight (PyObject *self, PyObject *args)
 
 /*
  * weechat_python_api_string_mask_to_regex: convert a mask (string with only
- *                                          "*" as joker) to a regex, paying
+ *                                          "*" as wildcard) to a regex, paying
  *                                          attention to special chars in a
  *                                          regex
  */
diff --git a/src/plugins/scripts/ruby/weechat-ruby-api.c b/src/plugins/scripts/ruby/weechat-ruby-api.c
index 34a52de59..67258afa4 100644
--- a/src/plugins/scripts/ruby/weechat-ruby-api.c
+++ b/src/plugins/scripts/ruby/weechat-ruby-api.c
@@ -462,7 +462,7 @@ weechat_ruby_api_string_has_highlight (VALUE class, VALUE string,
 
 /*
  * weechat_ruby_api_string_mask_to_regex: convert a mask (string with only
- *                                        "*" as joker) to a regex, paying
+ *                                        "*" as wildcard) to a regex, paying
  *                                        attention to special chars in a
  *                                        regex
  */
diff --git a/src/plugins/scripts/script.c b/src/plugins/scripts/script.c
index 8d8173a0f..24f7133cf 100644
--- a/src/plugins/scripts/script.c
+++ b/src/plugins/scripts/script.c
@@ -281,7 +281,7 @@ script_init (struct t_weechat_plugin *weechat_plugin,
                                  callback_completion, NULL);
         weechat_hook_infolist (string, N_("list of scripts"),
                                N_("script pointer (optional)"),
-                               N_("script name (can start or end with \"*\" as joker) (optional)"),
+                               N_("script name (can start or end with \"*\" as wildcard) (optional)"),
                                callback_infolist, NULL);
         free (string);
     }
diff --git a/src/plugins/scripts/tcl/weechat-tcl-api.c b/src/plugins/scripts/tcl/weechat-tcl-api.c
index 9e2688b4c..8430139df 100644
--- a/src/plugins/scripts/tcl/weechat-tcl-api.c
+++ b/src/plugins/scripts/tcl/weechat-tcl-api.c
@@ -525,7 +525,7 @@ weechat_tcl_api_string_has_highlight (ClientData clientData,
 
 /*
  * weechat_tcl_api_string_mask_to_regex: convert a mask (string with only
- *                                       "*" as joker) to a regex, paying
+ *                                       "*" as wildcard) to a regex, paying
  *                                       attention to special chars in a
  *                                       regex
  */