6 files changed, 82 insertions, 94 deletions
diff --git a/doc/de/autogen/user/weechat_commands.asciidoc b/doc/de/autogen/user/weechat_commands.asciidoc
index 5142b9e43..237527d9a 100644
--- a/doc/de/autogen/user/weechat_commands.asciidoc
+++ b/doc/de/autogen/user/weechat_commands.asciidoc
@@ -751,37 +751,35 @@ Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweite
          set <name> <value>
          del <name>
 
-passphrase: ändern der Passphrase (ohne Passphrase, werden die Daten in der Datei sec.conf in Klartext gesichert)
-   -delete: löscht Passphrase
-   decrypt: entschlüsselt Daten nachträglich (dies passiert nur falls die Passphrase beim Start nicht angegeben wurde)
-  -discard: verwirft alle verschlüsselten Daten
-       set: fügt eine schutzwürdige Information hinzu oder ändert eine bestehende
-       del: entfernt eine schutzwürdige Information
-
-Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die schutzwürdigen Informationen können dort eingesehen werden.
-
-Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start die Passphrase ab.
-Es ist möglich eine Umgebungsvariable "WEECHAT_PASSPHRASE" zu setzen um die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird auch von WeeChat beim /upgrade verwendet).
-
-schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden:
-  - Argument in der Befehlszeile für "--run-command"
-  - Einstellung weechat.startup.command_{before|after}_plugins
-  - Proxy-Optionen: username, password
-  - IRC Server Optionen: autojoin, command, password, sasl_{username|password}, Username, Realname
-  - Einstellung relay.network.password
-  - Befehl /eval.
-
-Beispiele:
-  festlegen eine Passphrase:
-    /secure passphrase Dies ist meine Passphrase
-  verschlüsselt freenode SASL Passwort:
-    /secure set freenode meinPasswort
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+   -delete: delete passphrase
+   decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+  -discard: discard all data still encrypted
+       set: add or change secured data
+       del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+  - command /eval
+  - command line argument "--run-command"
+  - options weechat.startup.command_{before|after}_plugins
+  - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated.
+
+Examples:
+  set a passphrase:
+    /secure passphrase this is my passphrase
+  encrypt freenode SASL password:
+    /secure set freenode mypassword
     /set irc.server.freenode.sasl_password "${sec.data.freenode}"
-  verschlüsselt oftc Passwort für nickserv:
-    /secure set oftc meinPasswort
+  encrypt oftc password for nickserv:
+    /secure set oftc mypassword
     /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
-  Alternativbefehl um den eigenen Nick zu ghosten:
-    /alias ghost /eval /msg -server freenode nickserv ghost meinNick ${sec.data.freenode}
+  alias to ghost the nick "mynick":
+    /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
 ----
 
 [[command_weechat_set]]
diff --git a/doc/en/autogen/user/weechat_commands.asciidoc b/doc/en/autogen/user/weechat_commands.asciidoc
index bc23aab1e..ff48499dc 100644
--- a/doc/en/autogen/user/weechat_commands.asciidoc
+++ b/doc/en/autogen/user/weechat_commands.asciidoc
@@ -764,12 +764,10 @@ When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
 It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
 
 Secured data with format ${sec.data.xxx} can be used in:
+  - command /eval
   - command line argument "--run-command"
   - options weechat.startup.command_{before|after}_plugins
-  - proxy options: username, password
-  - irc server options: autojoin, command, password, sasl_{username|password}, username, realname
-  - option relay.network.password
-  - command /eval.
+  - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated.
 
 Examples:
   set a passphrase:
diff --git a/doc/fr/autogen/user/weechat_commands.asciidoc b/doc/fr/autogen/user/weechat_commands.asciidoc
index 9e3e12328..268c50b25 100644
--- a/doc/fr/autogen/user/weechat_commands.asciidoc
+++ b/doc/fr/autogen/user/weechat_commands.asciidoc
@@ -764,12 +764,10 @@ Lorsqu'une phrase de chiffrement est utilisée (données chiffrées), elle est d
 Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour éviter la demande (cette même variable est utilisée par WeeChat sur le /upgrade).
 
 Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées dans :
+  - la commande /eval
   - le paramètre de ligne de commande "--run-command"
   - les options weechat.startup.command_{before|after}_plugins
-  - les options de proxy : username, password
-  - les options de serveur irc : autojoin, command, password, sasl_{username|password}, username, realname
-  - l'option relay.network.password
-  - la commande /eval.
+  - d'autres options qui peuvent contenir un mot de passe ou des données sensibles (par exemple proxy, serveur irc et relay) ; voir /help sur les options pour vérifier si elles sont évaluées.
 
 Exemples :
   définir une phrase de chiffrement :
diff --git a/doc/it/autogen/user/weechat_commands.asciidoc b/doc/it/autogen/user/weechat_commands.asciidoc
index 196183455..6f233801f 100644
--- a/doc/it/autogen/user/weechat_commands.asciidoc
+++ b/doc/it/autogen/user/weechat_commands.asciidoc
@@ -764,12 +764,10 @@ When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
 It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
 
 Secured data with format ${sec.data.xxx} can be used in:
+  - command /eval
   - command line argument "--run-command"
   - options weechat.startup.command_{before|after}_plugins
-  - proxy options: username, password
-  - irc server options: autojoin, command, password, sasl_{username|password}, username, realname
-  - option relay.network.password
-  - command /eval.
+  - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated.
 
 Examples:
   set a passphrase:
diff --git a/doc/ja/autogen/user/weechat_commands.asciidoc b/doc/ja/autogen/user/weechat_commands.asciidoc
index 9fddea069..d6aded45c 100644
--- a/doc/ja/autogen/user/weechat_commands.asciidoc
+++ b/doc/ja/autogen/user/weechat_commands.asciidoc
@@ -751,36 +751,34 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
          set <name> <value>
          del <name>
 
-passphrase: パスフレーズを変更 (パスフレーズがない場合、sec.conf ファイルに平文でデータを保存します)
-   -delete: パスフレーズを削除
-   decrypt: 暗号化されているデータを復号化 (起動時にパスフレーズが設定されていない場合に起きます)
-  -discard: 全ての暗号化データを破棄
-       set: 保護データを追加または変更
-       del: 保護データを削除
-
-引数がない場合、新しいバッファに保護データを表示します。
-
-パスフレーズを利用する場合 (データが暗号化されている場合)、WeeChat は起動時にパスフレーズを尋ねます。
-環境変数 "WEECHAT_PASSPHRASE" を利用すれば入力を回避できます (WeeChat は /upgrade の時に同じ変数を利用します)。
-
-${sec.data.xxx} の形でフォーマットされた保護データは以下の様に利用できます:
-  - コマンドライン引数 "--run-command"
-  - weechat.startup.command_{before|after}_plugins オプション
-  - プロキシオプション: username、password
-  - irc サーバオプション: autojoin、command、password、sasl_{username|password}、username、realname
-  - relay.network.password オプション
-  - /eval コマンド。
-
-例:
-  パスフレーズを設定:
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+   -delete: delete passphrase
+   decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+  -discard: discard all data still encrypted
+       set: add or change secured data
+       del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+  - command /eval
+  - command line argument "--run-command"
+  - options weechat.startup.command_{before|after}_plugins
+  - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated.
+
+Examples:
+  set a passphrase:
     /secure passphrase this is my passphrase
-  freenode の SASL パスワードを暗号化:
+  encrypt freenode SASL password:
     /secure set freenode mypassword
     /set irc.server.freenode.sasl_password "${sec.data.freenode}"
-  oftc の nickserv 用パスワードを暗号化:
+  encrypt oftc password for nickserv:
     /secure set oftc mypassword
     /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
-  ニックネーム "mynick" を取り戻すためのエイリアス ghost を設定
+  alias to ghost the nick "mynick":
     /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
 ----
 
diff --git a/doc/pl/autogen/user/weechat_commands.asciidoc b/doc/pl/autogen/user/weechat_commands.asciidoc
index 777eb4596..b12cbd464 100644
--- a/doc/pl/autogen/user/weechat_commands.asciidoc
+++ b/doc/pl/autogen/user/weechat_commands.asciidoc
@@ -751,37 +751,35 @@ Bez podania argumentu wszystkie pliki (WeeChat oraz wtyczki) zostaną przeładow
          set <nazwa> <wartość>
          del <nazwa>
 
-passphrase: zmienia hasło (bez hasła dane są przechowywane w postaci tekstu w pliku sec.conf)
-   -delete: kasuje hasło
-   decrypt: rozszyfrowuje dane będące ciągle zaszyfrowane (zdarza się to tylko jeśli hasło nie zostało podane przy uruchomieniu)
-  -discard: odrzuca wszystkie nadal zaszyfrowane dane
-       set: dodaje lub zmienia zaszyfrowane dane
-       del: kasuje zaszyfrowane dane
-
-Bez argumentu, komenda wyświetli zabezpieczone dane w nowym buforze.
-
-Jeśli używane jest hasło (dane zaszyfrowane), należy je podać podczas startu WeeChat.
-Jest możliwe ustawienie zmiennej środowiskowej "WEECHAT_PASSPHRASE", aby nie podawać hasła przy uruchomieniu (ta sama zmienna jest używana przez WeeChat podczas wykonywania /upgrade).
-
-Zabezpieczone dane w formacie ${sec.data.xxx} można użyć w:
-  - argumencie w linii poleceń "--run-command"
-  - opcjach weechat.startup.command_{before|after}_plugins
-  - opcjach proxy: username, password
-  - opcji serwera autojoin, command, password, sasl_{username|password}, username, realname
-  - opcji relay.network.password
-  - komendzie /eval.
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+   -delete: delete passphrase
+   decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+  -discard: discard all data still encrypted
+       set: add or change secured data
+       del: delete secured data
 
-Przykłady:
-  ustawienie hasła:
-    /secure passphrase to jest moje hasło
-  zaszyfrowanie hasła dla freenode SASL:
-    /secure set freenode mojehasło
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+  - command /eval
+  - command line argument "--run-command"
+  - options weechat.startup.command_{before|after}_plugins
+  - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated.
+
+Examples:
+  set a passphrase:
+    /secure passphrase this is my passphrase
+  encrypt freenode SASL password:
+    /secure set freenode mypassword
     /set irc.server.freenode.sasl_password "${sec.data.freenode}"
-  zaszyfrowanie hasła dla nickserva na serwerze oftc:
-    /secure set oftc mojehasło
+  encrypt oftc password for nickserv:
+    /secure set oftc mypassword
     /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
-  alias dla polecenia ghost dla nicka "mójnick":
-    /alias ghost /eval /msg -server freenode nickserv ghost mójnick ${sec.data.freenode}
+  alias to ghost the nick "mynick":
+    /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
 ----
 
 [[command_weechat_set]]