6 files changed, 74 insertions, 6 deletions
diff --git a/doc/ja/autogen/plugin_api/completions.txt b/doc/ja/autogen/plugin_api/completions.txt
index 91376ba8e..f3a0baea4 100644
--- a/doc/ja/autogen/plugin_api/completions.txt
+++ b/doc/ja/autogen/plugin_api/completions.txt
@@ -120,6 +120,8 @@
 
 | weechat | proxies_options | プロキシのオプション
 
+| weechat | secured_data | names of secured data (file sec.conf, section data)
+
 | weechat | weechat_commands | weechat コマンド
 
 | weechat | windows_numbers | ウィンドウの数
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index 8d9c1c68d..0ab08aa82 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -409,7 +409,7 @@
 ** 値: on, off (デフォルト値: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** 説明: `サーバに接続した際に参加するチャンネルのコンマ区切りリスト(例: "#chan1,#chan2,#chan3 key1,key2")`
+** 説明: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
@@ -449,7 +449,7 @@
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
 * [[option_irc.server_default.command]] *irc.server_default.command*
-** 説明: `サーバに接続した際に実行するコマンド (";" で分けて 複数のコマンドを列挙、セミコロンは "\;" とする、特殊変数 $nick、$channel、$server はそれぞれの値に置換される)`
+** 説明: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
@@ -514,7 +514,7 @@
 ** 値: plain, dh-blowfish, dh-aes, external (デフォルト値: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** 説明: `SASL 認証用パスワード`
+** 説明: `password for SASL authentication (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
@@ -524,7 +524,7 @@
 ** 値: 1 .. 3600 (デフォルト値: `15`)
 
 * [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** 説明: `SASL 認証用ユーザ名`
+** 説明: `username for SASL authentication (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
diff --git a/doc/ja/autogen/user/sec_options.txt b/doc/ja/autogen/user/sec_options.txt
new file mode 100644
index 000000000..a8138b7f1
--- /dev/null
+++ b/doc/ja/autogen/user/sec_options.txt
@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** 説明: `cipher used to crypt data (the number after algorithm is the size of the key in bits)`
+** タイプ: 整数
+** 値: aes128, aes192, aes256 (デフォルト値: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** 説明: `hash algorithm used to check the decrypted data`
+** タイプ: 整数
+** 値: sha224, sha256, sha384, sha512 (デフォルト値: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** 説明: `path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"`
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** 説明: `use salt when generating key used in encryption (recommended for maximum security); when enabled, the content of crypted data in file sec.conf will be different on each write of the file; if you put the file sec.conf in a version control system, then you can turn off this option to have always same content in file`
+** タイプ: ブール
+** 値: on, off (デフォルト値: `on`)
+
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index bec5df1b3..9e7a75043 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -610,6 +610,45 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
 引数無しでは、全てのファイル (WeeChat とプラグイン) が保存されます。
 ........................................
 
+[[command_weechat_secure]]
+[command]*`secure`* manage secured data (passwords or private data encrypted in file sec.conf)::
+........................................
+/secure  passphrase <passphrase>|-delete
+         decrypt <passphrase>|-discard
+         set <name> <value>
+         del <name>
+
+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 data
+       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 line argument "--run-command"
+  - irc server options: autojoin, command, password, sasl_{username|password}
+  - options weechat.startup.command_{before|after}_plugins
+  - command /eval.
+
+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}"
+  encrypt oftc password for nickserv:
+    /secure set oftc mypassword
+    /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+  alias to ghost the nick "mynick":
+    /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
+........................................
+
 [[command_weechat_set]]
 [command]*`set`* オプションの設定::
 ........................................
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index 0fccf9009..69759b07d 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -844,12 +844,12 @@
 ** 値: on, off (デフォルト値: `on`)
 
 * [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** 説明: `WeeChat が実行され、プラグインのロード後に実行されるコマンド`
+** 説明: `command executed when WeeChat starts, after loading plugins (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
 * [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** 説明: `WeeChat が実行され、プラグインのロード前に実行されるコマンド`
+** 説明: `command executed when WeeChat starts, before loading plugins (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt
index 805c14748..ff56c371b 100644
--- a/doc/ja/weechat_user.ja.txt
+++ b/doc/ja/weechat_user.ja.txt
@@ -1437,6 +1437,13 @@ WeeChat はスクリーンに色が表示された時点で色ペアを動的に
 /set weechat.color.status_time *99999
 ----------------------------------------
 
+// TRANSLATION MISSING
+[[sec_options]]
+Secured data options (sec.conf)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::autogen/user/sec_options.txt[]
+
 [[weechat_options]]
 === WeeChat オプション (weechat.conf) ===