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, 69 insertions, 27 deletions

diff --git a/po/ru.po b/po/ru.po
index 08c392f6f..ccee7c265 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: 2018-01-29 20:59+0100\n"
+"POT-Creation-Date: 2018-02-05 21:21+0100\n"
 "PO-Revision-Date: 2018-01-06 13:50+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7324,21 +7324,6 @@ msgid ""
 "%s%s: invalid priorities string, error at this position in string: \"%s\""
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s%s: the evaluated fingerprint must not be empty"
-msgstr "%s не могу создать сервер\n"
-
-#, c-format
-msgid ""
-"%s%s: invalid fingerprint size, the number of hexadecimal digits must be one "
-"of: %s"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s%s: invalid fingerprint, it must contain only hexadecimal digits (0-9, a-f)"
-msgstr ""
-
 #, c-format
 msgid ""
 "%s%s: invalid length for split, it must be either 0 or any integer between "
@@ -7373,7 +7358,8 @@ msgstr "%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 "ник, используемый на IRC сервере"
 
 msgid ""
@@ -7412,14 +7398,22 @@ msgid ""
 "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 ""
 
 msgid "check that the SSL connection is fully trusted"
 msgstr ""
 
-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 ""
+"      канал: канал, на котором присутствует пользователь\n"
+"        ник: цель для кика\n"
+"комментарий: причина кика"
 
 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -7436,16 +7430,27 @@ msgid ""
 "AES crypted password (insecure, not recommended)"
 msgstr ""
 
+#, 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 ""
+"      канал: канал, на котором присутствует пользователь\n"
+"        ник: цель для кика\n"
+"комментарий: причина кика"
 
+#, 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 ""
+"      канал: канал, на котором присутствует пользователь\n"
+"        ник: цель для кика\n"
+"комментарий: причина кика"
 
 #, fuzzy
 msgid ""
@@ -7478,7 +7483,8 @@ 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 "ник, используемый на IRC сервере"
 
 msgid ""
@@ -7488,11 +7494,25 @@ msgid ""
 "nick not used on server"
 msgstr ""
 
-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 ""
+"      канал: канал, на котором присутствует пользователь\n"
+"        ник: цель для кика\n"
+"комментарий: причина кика"
 
-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 ""
+"      канал: канал, на котором присутствует пользователь\n"
+"        ник: цель для кика\n"
+"комментарий: причина кика"
 
 #, fuzzy
 msgid ""
@@ -7507,7 +7527,9 @@ 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 ""
 "команды, выполняемые при подключении к серверу (несколько команд должны быть "
 "разделены символом ';', используйте '\\;' вместо обычной точки с запятой, "
@@ -7519,7 +7541,9 @@ 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 ""
 "команды, выполняемые при подключении к серверу (несколько команд должны быть "
 "разделены символом ';', используйте '\\;' вместо обычной точки с запятой, "
@@ -7540,7 +7564,9 @@ msgid ""
 "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 ""
 
 msgid ""
@@ -8741,6 +8767,22 @@ msgid ""
 msgstr ""
 
 #, fuzzy, c-format
+msgid "%s%s: the evaluated fingerprint for server \"%s\" must not be empty"
+msgstr "%s не могу создать сервер\n"
+
+#, c-format
+msgid ""
+"%s%s: invalid fingerprint size for server \"%s\", the number of hexadecimal "
+"digits must be one of: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s%s: invalid fingerprint for server \"%s\", it must contain only "
+"hexadecimal digits (0-9, a-f)"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "%s%s: error when allocating new server"
 msgstr "%s не могу расположить новый сервер\n"