diff --git a/doc/de/autogen/user/weechat_commands.adoc b/doc/de/autogen/user/weechat_commands.adoc
index c34ff4898..3193096de 100644
--- a/doc/de/autogen/user/weechat_commands.adoc
+++ b/doc/de/autogen/user/weechat_commands.adoc
@@ -814,31 +814,31 @@ Beispiele:
       diff [<option> [<option>...]]
       env [<variable> [<value>]]
 
-option: Name der zu ändernden Einstellung (um mehrere Einstellungen anzuzeigen, kann der Platzhalter "*" verwendet werden)
- value: neuer Wert den die Einstellung erhalten soll. Abhängig von der ausgewählten Einstellung, kann die Variable folgenden Inhalt haben:
-          boolean: on, off oder toggle
-          integer: Nummer, ++Nummer oder --Nummer
-           string: beliebige Zeichenkette ("" für eine leere Zeichenkette)
-            color: Farbwert, ++Nummer oder --Nummer
-        Hinweis: für alle Typen von Variablen kann die Zeichenkette "null" (ohne "")  genutzt werden, um den Wert der Einstellung zu löschen (undefinierter Wert). Dies kann nur auf einige besondere Variablen (Erweiterungen) angewendet werden.
-  diff: es werden nur Einstellungen angezeigt, die geändert wurden
-   env: setzt oder zeigt eine Umgebungsvariable an (um eine Variable zu entfernen muss der Wert "" genutzt werden)
+option: name of an option (wildcard "*" is allowed to list options, if no value is specified)
+ value: new value for option, according to type:
+          boolean: on, off or toggle
+          integer: number, ++number or --number
+           string: any string ("" for empty string)
+            color: color name, ++number or --number
+        Note: for all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
+  diff: display only changed options
+   env: display or set an environment variable (use value "" to unset a variable)
 
-Beispiele:
-  Zeigt alle Einstellungen 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 Einstellungen an, die verändert wurden:
+  display changed options:
     /set diff
-  zeigt Einstellungen der IRC Erweiterung an, die verändert wurden:
+  display changed options in irc plugin:
     /set diff irc.*
-  zeigt den Wert der Umgebungsvariable LANG an:
+  display value of environment variable LANG:
     /set env LANG
-  setzt die Umgebungsvariable LANG und nutzt diese:
+  set environment variable LANG and use it:
     /set env LANG fr_FR.UTF-8
     /upgrade
-  entfernt die Umgebungsvariable ABC:
+  unset environment variable ABC:
     /set env ABC ""
 ----
 
diff --git a/doc/en/autogen/user/weechat_commands.adoc b/doc/en/autogen/user/weechat_commands.adoc
index e1fc0cc5b..c0c951e06 100644
--- a/doc/en/autogen/user/weechat_commands.adoc
+++ b/doc/en/autogen/user/weechat_commands.adoc
@@ -814,7 +814,7 @@ Examples:
       diff [<option> [<option>...]]
       env [<variable> [<value>]]
 
-option: name of an option (wildcard "*" is allowed)
+option: name of an option (wildcard "*" is allowed to list options, if no value is specified)
  value: new value for option, according to type:
           boolean: on, off or toggle
           integer: number, ++number or --number
diff --git a/doc/fr/autogen/user/weechat_commands.adoc b/doc/fr/autogen/user/weechat_commands.adoc
index 8cabd3eb3..277223b1c 100644
--- a/doc/fr/autogen/user/weechat_commands.adoc
+++ b/doc/fr/autogen/user/weechat_commands.adoc
@@ -814,7 +814,7 @@ Exemples :
       diff [<option> [<option>...]]
       env [<variable> [<valeur>]]
 
-option : nom d'une option (le caractère joker "*" est autorisé)
+option : nom d'une option (le caractère joker "*" est autorisé pour lister les options, si aucune valeur n'est spécifiée)
 valeur : nouvelle valeur pour l'option, selon le type :
            booléen : on, off ou toggle
             entier : nombre, ++nombre ou --nombre
diff --git a/doc/it/autogen/user/weechat_commands.adoc b/doc/it/autogen/user/weechat_commands.adoc
index b2289f947..fdd15a85b 100644
--- a/doc/it/autogen/user/weechat_commands.adoc
+++ b/doc/it/autogen/user/weechat_commands.adoc
@@ -814,7 +814,7 @@ Examples:
       diff [<option> [<option>...]]
       env [<variable> [<value>]]
 
-option: name of an option (wildcard "*" is allowed)
+option: name of an option (wildcard "*" is allowed to list options, if no value is specified)
  value: new value for option, according to type:
           boolean: on, off or toggle
           integer: number, ++number or --number
diff --git a/doc/ja/autogen/user/weechat_commands.adoc b/doc/ja/autogen/user/weechat_commands.adoc
index 4f5994ef4..aa3e4bc12 100644
--- a/doc/ja/autogen/user/weechat_commands.adoc
+++ b/doc/ja/autogen/user/weechat_commands.adoc
@@ -814,31 +814,31 @@ ${sec.data.xxx} の形で書かれた保護データは以下の様に利用で
       diff [<option> [<option>...]]
       env [<variable> [<value>]]
 
-option: オプションの名前 (ワイルドカード "*" を使うことができます)
- value: オプションに対する新しい値、以下の型に従う:
-          boolean: on、off、toggle
-          integer: 番号、++番号、--番号
-           string: 任意の文字列 (空文字列は "")
-            color: 色の名前、++色番号、--色番号
-        注意: どんな型であっても、オプションの値を削除する (未定義値にする) には null が使えます。これはいくつかの特別なプラグイン変数でのみ有効です。
-  diff: 変更されたオプションのみを表示
-   env: 環境変数を表示または設定 (変数の値を削除するには値に "" を入れてください)
+option: name of an option (wildcard "*" is allowed to list options, if no value is specified)
+ value: new value for option, according to type:
+          boolean: on, off or toggle
+          integer: number, ++number or --number
+           string: any string ("" for empty string)
+            color: color name, ++number or --number
+        Note: for all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
+  diff: display only changed options
+   env: display or set an environment variable (use value "" to unset a variable)
 
-例:
-  ハイライトに関するオプションを表示:
+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.*
-  環境変数 LANG の値を表示:
+  display value of environment variable LANG:
     /set env LANG
-  環境変数 LANG を設定し、これを使う:
+  set environment variable LANG and use it:
     /set env LANG fr_FR.UTF-8
     /upgrade
-  環境変数 ABC の値を削除する:
+  unset environment variable ABC:
     /set env ABC ""
 ----
 
diff --git a/doc/pl/autogen/user/weechat_commands.adoc b/doc/pl/autogen/user/weechat_commands.adoc
index 7e57a4be9..2d414348d 100644
--- a/doc/pl/autogen/user/weechat_commands.adoc
+++ b/doc/pl/autogen/user/weechat_commands.adoc
@@ -814,31 +814,31 @@ Przykłady:
       diff [<opcja> [<opcja>...]]
       env [<zmienna> [<wartość>]]
 
-opcja: nazwa opcji (może zawierać wildcard"*")
- wartość: nowa wartość opcji, zgodnie z typem:
-          boolean: on, off lub toggle
-          integer: numer, ++numer lub --numer
-           string: dowolny ciąg ("" dla pustego ciągu)
-            color: nazwa koloru, ++numer lub --numer
-        Uwaga: dla wszystkich typów, można użyć null dla usunięcia wartości opcji (niezdefiniowana wartość). Działa to tylko z niektórymi specjalnymi zmiennymi wtyczek.
-  diff: wyświetla tylko zmienione opcje
-   env: wyświetla lub ustawia zmienne środowiskowe (użyj "" żeby skasować zmienną)
+option: name of an option (wildcard "*" is allowed to list options, if no value is specified)
+ value: new value for option, according to type:
+          boolean: on, off or toggle
+          integer: number, ++number or --number
+           string: any string ("" for empty string)
+            color: color name, ++number or --number
+        Note: for all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
+  diff: display only changed options
+   env: display or set an environment variable (use value "" to unset a variable)
 
-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.*
-  wyświetla wartość zmiennej środowiskowej LANG:
+  display value of environment variable LANG:
     /set env LANG
-  ustawia zmienną środowiskową LANG i używa jej:
+  set environment variable LANG and use it:
     /set env LANG fr_FR.UTF-8
     /upgrade
-  kasuje zmienną środowiskową ABC:
+  unset environment variable ABC:
     /set env ABC ""
 ----
 
diff --git a/po/cs.po b/po/cs.po
index 8e4c5adf0..d82d545af 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:32+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2313,7 +2313,8 @@ msgstr "[<možnost> [<hodnota>]]"
 
 #, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/de.po b/po/de.po
index d7e9eb6d6..00b919912 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-08-14 17:56+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -2745,8 +2745,10 @@ msgstr ""
 "[<option> [<value>]] || diff [<option> [<option>...]] || env [<variable> "
 "[<value>]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/es.po b/po/es.po
index 112d5a08b..1b930329b 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:32+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2422,7 +2422,8 @@ msgstr "[<opción> [<valor>]] || diff [<opción> [<opción>...]]"
 
 #, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/fr.po b/po/fr.po
index ba1f0300f..5e3dda185 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: 2017-08-25 07:44+0200\n"
-"PO-Revision-Date: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
+"PO-Revision-Date: 2017-09-01 21:03+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -2691,7 +2691,8 @@ msgstr ""
 "[<valeur>]]"
 
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
@@ -2720,7 +2721,8 @@ msgid ""
 "  unset environment variable ABC:\n"
 "    /set env ABC \"\""
 msgstr ""
-"option : nom d'une option (le caractère joker \"*\" est autorisé)\n"
+"option : nom d'une option (le caractère joker \"*\" est autorisé pour lister "
+"les options, si aucune valeur n'est spécifiée)\n"
 "valeur : nouvelle valeur pour l'option, selon le type :\n"
 "           booléen : on, off ou toggle\n"
 "            entier : nombre, ++nombre ou --nombre\n"
diff --git a/po/hu.po b/po/hu.po
index 0e0083ef2..f135ddb38 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:32+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2048,7 +2048,8 @@ msgid ""
 msgstr "[opció [ = érték]]"
 
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/it.po b/po/it.po
index e9a8514f7..cb2b9e477 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:32+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2509,7 +2509,8 @@ msgstr "[<opzione> [<valore>]] || diff [<opzione> [<opzione>...]]"
 
 #, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/ja.po b/po/ja.po
index 033edf1e7..26bbc1743 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-08-26 09:00+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -2612,8 +2612,10 @@ msgstr ""
 "[<option> [<value>]] || diff [<option> [<option>...]] || env [<variable> "
 "[<value>]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/pl.po b/po/pl.po
index 264c5cbd9..d2b6899e3 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-07-22 12:55+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2672,8 +2672,10 @@ msgstr ""
 "[<opcja> [<wartość>]] || diff [<opcja> [<opcja>...]] || env [<zmienna> "
 "[<wartość>]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/pt.po b/po/pt.po
index 9a722e86b..653caf19c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-07-22 12:55+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -2653,8 +2653,10 @@ msgstr ""
 "[<opção> [<valor>]] || diff [<opção> [<opção>...]] || env [<variável> "
 "[<valor>]]"
 
+#, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ccb546af2..ad88e4167 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:33+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2446,7 +2446,8 @@ msgstr "[<opção> [<valor>]] || diff [<opção> [<opção>...]]"
 
 #, fuzzy
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/ru.po b/po/ru.po
index 20e4029e7..390bdfcff 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:33+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2071,7 +2071,8 @@ msgid ""
 msgstr "[параметр [ = значение]]"
 
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/tr.po b/po/tr.po
index 99e8fa114..848d83f04 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: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2017-06-26 23:33+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1865,7 +1865,8 @@ msgid ""
 msgstr "[<seçenek> [<değer>]] || diff [<seçenek> [<seçenek>...]]"
 
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 29f5635aa..9ece8e1bf 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-08-25 07:44+0200\n"
+"POT-Creation-Date: 2017-09-01 21:02+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1863,7 +1863,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"option: name of an option (wildcard \"*\" is allowed)\n"
+"option: name of an option (wildcard \"*\" is allowed to list options, if no "
+"value is specified)\n"
 " value: new value for option, according to type:\n"
 "          boolean: on, off or toggle\n"
 "          integer: number, ++number or --number\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index b9f5c0f0c..e4983cad7 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -7902,7 +7902,8 @@ command_init ()
         N_("[<option> [<value>]]"
            " || diff [<option> [<option>...]]"
            " || env [<variable> [<value>]]"),
-        N_("option: name of an option (wildcard \"*\" is allowed)\n"
+        N_("option: name of an option (wildcard \"*\" is allowed to list "
+           "options, if no value is specified)\n"
            " value: new value for option, according to type:\n"
            "          boolean: on, off or toggle\n"
            "          integer: number, ++number or --number\n"