irc: allow ${irc_server.xxx} and ${server} in server evaluated options (closes #1144)

The server option "ssl_fingerprint" is now evaluated when it is used (during
SSL connection), instead of when it is set with command /set.

1 files changed, 73 insertions, 35 deletions

diff --git a/po/ja.po b/po/ja.po
index 5298adb09..70198d961 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-01-29 20:59+0100\n"
-"PO-Revision-Date: 2018-01-20 09:00+0900\n"
+"POT-Creation-Date: 2018-02-05 21:21+0100\n"
+"PO-Revision-Date: 2018-02-05 21:30+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
 "translation/ja_JP>\n"
@@ -8795,24 +8795,6 @@ msgid ""
 msgstr "%s%s: 不正なプロパティ文字列、文字列のエラーの位置: \"%s\""
 
 #, c-format
-msgid "%s%s: the evaluated fingerprint must not be empty"
-msgstr "%s%s: 評価に際して指紋の内容が見つかりませんでした"
-
-#, c-format
-msgid ""
-"%s%s: invalid fingerprint size, the number of hexadecimal digits must be one "
-"of: %s"
-msgstr ""
-"%s%s: 指紋のサイズが間違っています、次の 16 進数から 1 つ選んでください: %s"
-
-#, c-format
-msgid ""
-"%s%s: invalid fingerprint, it must contain only hexadecimal digits (0-9, a-f)"
-msgstr ""
-"%s%s: 指紋が間違っています、指紋の各桁は 16 進数で使える文字 (0-9, a-f) を"
-"使ってください"
-
-#, c-format
 msgid ""
 "%s%s: invalid length for split, it must be either 0 or any integer between "
 "128 and 4096"
@@ -8853,9 +8835,11 @@ msgstr ""
 msgid "%s%s: error creating CTCP \"%s\" => \"%s\""
 msgstr "%s%s: CTCP の作成中にエラー \"%s\" => \"%s\""
 
+#, fuzzy
 msgid ""
 "list of hostname/port or IP/port for server (separated by comma) (note: "
-"content is evaluated, see /help eval)"
+"content is evaluated, see /help eval; server options are evaluated with "
+"${irc_server.xxx} and ${server} is replaced by the server name)"
 msgstr ""
 "サーバのホスト名/ポート番号または IP アドレス/ポート番号のリスト (コンマ区切"
 "り) (注意: 値は評価されます、/help eval を参照してください)"
@@ -8896,13 +8880,15 @@ msgstr ""
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr "Diffie-Hellman 鍵交換で使われる鍵長"
 
+#, fuzzy
 msgid ""
 "fingerprint of certificate which is trusted and accepted for the server; "
 "only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 "
 "chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many "
 "fingerprints can be separated by commas; if this option is set, the other "
 "checks on certificates are NOT performed (option \"ssl_verify\") (note: "
-"content is evaluated, see /help eval)"
+"content is evaluated, see /help eval; server options are evaluated with "
+"${irc_server.xxx} and ${server} is replaced by the server name)"
 msgstr ""
 "信頼でき、通信を認めるサーバ証明書の指紋; 16 進数で使える文字 (0-9, a-f) 以外"
 "は指定できません: SHA-512 の場合 64 文字、SHA-256 の場合 32 文字、SHA-1 の場"
@@ -8914,9 +8900,15 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr "SSL 接続が完全に信頼できることを確認"
 
-msgid "password for server (note: content is evaluated, see /help eval)"
+#, fuzzy
+msgid ""
+"password for server (note: content is evaluated, see /help eval; server "
+"options are evaluated with ${irc_server.xxx} and ${server} is replaced by "
+"the server name)"
 msgstr ""
-"サーバのパスワード (注意: 値は評価されます、/help eval を参照してください)"
+"\"/kick\" と \"/kickban\" コマンドが使うデフォルトのキックメッセージ (注意: "
+"値は評価されます、/help eval を参照。特殊変数 ${nick}、${channel}、${server} "
+"はそれぞれの値に置換されます)"
 
 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -8940,17 +8932,22 @@ msgstr ""
 "用した認証<、\"dh-blowfish\" は blowfish 暗号化パスワード (危険、非推"
 "奨)、\"dh-aes\" は AES 暗号化パスワード (危険、非推奨)"
 
+#, fuzzy
 msgid ""
 "username for SASL authentication; this option is not used for mechanism "
-"\"external\" (note: content is evaluated, see /help eval)"
+"\"external\" (note: content is evaluated, see /help eval; server options are "
+"evaluated with ${irc_server.xxx} and ${server} is replaced by the server "
+"name)"
 msgstr ""
 "SASL 認証のユーザ名; このオプションは \"external\" メカニズムの場合には利用さ"
 "れません (注意: 値は評価されます、/help eval を参照してください)"
 
+#, fuzzy
 msgid ""
 "password for SASL authentication; this option is not used for mechanisms "
 "\"ecdsa-nist256p-challenge\" and \"external\" (note: content is evaluated, "
-"see /help eval)"
+"see /help eval; server options are evaluated with ${irc_server.xxx} and "
+"${server} is replaced by the server name)"
 msgstr ""
 "SASL 認証のパスワード; このオプションは \"ecdsa-nist256p-challenge\" および "
 "\"external\" メカニズムの場合には利用されません (注意: 値は評価されます、/"
@@ -8985,9 +8982,11 @@ msgstr "接続が切れたときに自動的に再接続"
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "サーバへの再接続の際の遅延 (秒単位) 時間"
 
+#, fuzzy
 msgid ""
 "nicknames to use on server (separated by comma) (note: content is evaluated, "
-"see /help eval)"
+"see /help eval; server options are evaluated with ${irc_server.xxx} and "
+"${server} is replaced by the server name)"
 msgstr ""
 "サーバで使用するニックネーム (コンマ区切り) (注意: 値は評価されます、/help "
 "eval を参照してください)"
@@ -9003,14 +9002,25 @@ msgstr ""
 "す。その後利用されていないニックネームが見つかるまで、最後の 1 文字 (または最"
 "後の 2 文字) を 1 から 99 まで置き換えていきます"
 
-msgid "user name to use on server (note: content is evaluated, see /help eval)"
+#, fuzzy
+msgid ""
+"user name to use on server (note: content is evaluated, see /help eval; "
+"server options are evaluated with ${irc_server.xxx} and ${server} is "
+"replaced by the server name)"
 msgstr ""
-"サーバで使用するユーザ名 (注意: 値は評価されます、/help eval を参照してくださ"
-"い)"
+"\"/kick\" と \"/kickban\" コマンドが使うデフォルトのキックメッセージ (注意: "
+"値は評価されます、/help eval を参照。特殊変数 ${nick}、${channel}、${server} "
+"はそれぞれの値に置換されます)"
 
-msgid "real name to use on server (note: content is evaluated, see /help eval)"
+#, fuzzy
+msgid ""
+"real name to use on server (note: content is evaluated, see /help eval; "
+"server options are evaluated with ${irc_server.xxx} and ${server} is "
+"replaced by the server name)"
 msgstr ""
-"サーバで使用する実名 (注意: 値は評価されます、/help eval を参照してください)"
+"\"/kick\" と \"/kickban\" コマンドが使うデフォルトのキックメッセージ (注意: "
+"値は評価されます、/help eval を参照。特殊変数 ${nick}、${channel}、${server} "
+"はそれぞれの値に置換されます)"
 
 msgid ""
 "custom local hostname/IP for server (optional, if empty local hostname is "
@@ -9019,22 +9029,28 @@ msgstr ""
 "サーバで使用するカスタムホスト名/IP アドレス (任意、空の場合はローカルホスト"
 "名が使われる)"
 
+#, fuzzy
 msgid ""
 "user mode(s) to set after connection to server and before executing command "
 "and the auto-join of channels; examples: \"+R\" (to set mode \"R\"), \"+R-i"
 "\" (to set mode \"R\" and remove \"i\"); see /help mode for the complete "
-"mode syntax (note: content is evaluated, see /help eval)"
+"mode syntax (note: content is evaluated, see /help eval; server options are "
+"evaluated with ${irc_server.xxx} and ${server} is replaced by the server "
+"name)"
 msgstr ""
 "サーバへの接続後、コマンドの実行とチャンネルへの自動参加前に設定するユーザ"
 "モード; 例: \"+R\" (モード \"R\" を設定)、\"+R-i\" (モード \"R\" を設定、モー"
 "ド \"i\" を未設定); 完全なモード書式を見るには /help mode を参照してください "
 "(注意: 値は評価されます、/help eval を参照)"
 
+#, fuzzy
 msgid ""
 "command(s) to run after connection to server and before auto-join of "
 "channels (many commands can 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)"
+"their value) (note: content is evaluated, see /help eval; server options are "
+"evaluated with ${irc_server.xxx} and ${server} is replaced by the server "
+"name)"
 msgstr ""
 "サーバに接続した後、チャンネルに自動参加する前に実行するコマンド (\";\" で分"
 "けて 複数のコマンドを列挙できます、セミコロンは \"\\;\" のように使ってくださ"
@@ -9048,13 +9064,16 @@ msgstr ""
 "コマンドを実行して、チャンネルに自動参加するまでの遅延時間 (秒単位) (例: 認証"
 "に時間がかかる場合にチャンネル参加前に少し時間を空ける)"
 
+#, fuzzy
 msgid ""
 "comma separated list of channels to join after connection to server (and "
 "after executing command + delay if they are set); the channels that require "
 "a key must be at beginning of the list, and all the keys must be given after "
 "the channels (separated by a space) (example: \"#channel1,#channel2,"
 "#channel3 key1,key2\" where #channel1 and #channel2 are protected by key1 "
-"and key2) (note: content is evaluated, see /help eval)"
+"and key2) (note: content is evaluated, see /help eval; server options are "
+"evaluated with ${irc_server.xxx} and ${server} is replaced by the server "
+"name)"
 msgstr ""
 "サーバに接続した後 (設定されていればさらにコマンドを実行し、遅延時間待った"
 "後) に参加するチャンネルのコンマ区切りリスト;鍵が必要なチャンネルはリストの最"
@@ -10394,6 +10413,25 @@ msgstr ""
 "%sgnutls: SASL \"ecdsa-nist256p-challenge\" を使うには、バージョン 3.0.21 以"
 "上が必要です"
 
+#, fuzzy, c-format
+msgid "%s%s: the evaluated fingerprint for server \"%s\" must not be empty"
+msgstr "%s%s: 評価に際して指紋の内容が見つかりませんでした"
+
+#, fuzzy, c-format
+msgid ""
+"%s%s: invalid fingerprint size for server \"%s\", the number of hexadecimal "
+"digits must be one of: %s"
+msgstr ""
+"%s%s: 指紋のサイズが間違っています、次の 16 進数から 1 つ選んでください: %s"
+
+#, fuzzy, c-format
+msgid ""
+"%s%s: invalid fingerprint for server \"%s\", it must contain only "
+"hexadecimal digits (0-9, a-f)"
+msgstr ""
+"%s%s: 指紋が間違っています、指紋の各桁は 16 進数で使える文字 (0-9, a-f) を"
+"使ってください"
+
 #, c-format
 msgid "%s%s: error when allocating new server"
 msgstr "%s%s: 新しいサーバの割り当て中にエラー"