From 5936272b4ca7d05c8a082f7fd09c3bbabbf92fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Thu, 25 Feb 2016 07:35:12 +0100 Subject: [PATCH] irc: complete help of SASL fail options --- doc/de/autogen/user/irc_options.asciidoc | 4 ++-- doc/en/autogen/user/irc_options.asciidoc | 4 ++-- doc/fr/autogen/user/irc_options.asciidoc | 4 ++-- doc/it/autogen/user/irc_options.asciidoc | 4 ++-- doc/ja/autogen/user/irc_options.asciidoc | 4 ++-- doc/pl/autogen/user/irc_options.asciidoc | 4 ++-- po/cs.po | 8 +++++--- po/de.po | 9 ++++++--- po/es.po | 8 +++++--- po/fr.po | 24 ++++++++++++++++++------ po/hu.po | 8 +++++--- po/it.po | 8 +++++--- po/ja.po | 9 ++++++--- po/pl.po | 9 ++++++--- po/pt_BR.po | 8 +++++--- po/ru.po | 8 +++++--- po/tr.po | 8 +++++--- po/weechat.pot | 8 +++++--- src/plugins/irc/irc-config.c | 7 +++++-- 19 files changed, 93 insertions(+), 53 deletions(-) diff --git a/doc/de/autogen/user/irc_options.asciidoc b/doc/de/autogen/user/irc_options.asciidoc index c8a91f3bf..58409b06f 100644 --- a/doc/de/autogen/user/irc_options.asciidoc +++ b/doc/de/autogen/user/irc_options.asciidoc @@ -428,7 +428,7 @@ ** Werte: 1 .. 10080 (Standardwert: `5`) * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable* -** Beschreibung: `cause SASL authentication failure when SASL is requested but unavailable on the server` +** Beschreibung: `cause SASL authentication failure when SASL is requested but unavailable on the server; when this option is enabled, it has effect only if option "sasl_fail" is set to "reconnect" or "disconnect" in the server` ** Typ: boolesch ** Werte: on, off (Standardwert: `on`) @@ -573,7 +573,7 @@ ** Werte: beliebige Zeichenkette (Standardwert: `""`) * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail* -** Beschreibung: `auszuführende Aktion falls die SASL Authentifizierung fehlschlägt: "continue" ignoriert das Problem, das bei der Authentifizierung aufgetreten ist, "reconnect" versucht erneut eine Verbindung herzustellen, "disconnect" trennt die Verbindung zum Server` +** Beschreibung: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server (see also option irc.network.sasl_fail_unavailable)` ** Typ: integer ** Werte: continue, reconnect, disconnect (Standardwert: `continue`) diff --git a/doc/en/autogen/user/irc_options.asciidoc b/doc/en/autogen/user/irc_options.asciidoc index 810cb3d27..50a58028f 100644 --- a/doc/en/autogen/user/irc_options.asciidoc +++ b/doc/en/autogen/user/irc_options.asciidoc @@ -428,7 +428,7 @@ ** values: 1 .. 10080 (default value: `5`) * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable* -** description: `cause SASL authentication failure when SASL is requested but unavailable on the server` +** description: `cause SASL authentication failure when SASL is requested but unavailable on the server; when this option is enabled, it has effect only if option "sasl_fail" is set to "reconnect" or "disconnect" in the server` ** type: boolean ** values: on, off (default value: `on`) @@ -573,7 +573,7 @@ ** values: any string (default value: `""`) * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail* -** description: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server` +** description: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server (see also option irc.network.sasl_fail_unavailable)` ** type: integer ** values: continue, reconnect, disconnect (default value: `continue`) diff --git a/doc/fr/autogen/user/irc_options.asciidoc b/doc/fr/autogen/user/irc_options.asciidoc index 954c0ed90..9854a5a7a 100644 --- a/doc/fr/autogen/user/irc_options.asciidoc +++ b/doc/fr/autogen/user/irc_options.asciidoc @@ -428,7 +428,7 @@ ** valeurs: 1 .. 10080 (valeur par défaut: `5`) * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable* -** description: `provoquer un échec d'authentification SASL quand SASL est demandé mais non disponible sur le serveur` +** description: `provoquer un échec d'authentification SASL quand SASL est demandé mais non disponible sur le serveur ; lorsque cette option est activée, elle n'a d'effet que si l'option "sasl_fail" est égale à "reconnect" ou "disconnect" dans le serveur` ** type: booléen ** valeurs: on, off (valeur par défaut: `on`) @@ -573,7 +573,7 @@ ** valeurs: toute chaîne (valeur par défaut: `""`) * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail* -** description: `action à effectuer si l'authentification SASL échoue : "continue" pour ignorer le problème d'authentification, "reconnect" pour planifier une reconnexion au serveur, "disconnect" pour se déconnecter du serveur` +** description: `action à effectuer si l'authentification SASL échoue : "continue" pour ignorer le problème d'authentification, "reconnect" pour planifier une reconnexion au serveur, "disconnect" pour se déconnecter du serveur (voir aussi l'option irc.network.sasl_fail_unavailable)` ** type: entier ** valeurs: continue, reconnect, disconnect (valeur par défaut: `continue`) diff --git a/doc/it/autogen/user/irc_options.asciidoc b/doc/it/autogen/user/irc_options.asciidoc index 168ec45c1..e251abdeb 100644 --- a/doc/it/autogen/user/irc_options.asciidoc +++ b/doc/it/autogen/user/irc_options.asciidoc @@ -428,7 +428,7 @@ ** valori: 1 .. 10080 (valore predefinito: `5`) * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable* -** descrizione: `cause SASL authentication failure when SASL is requested but unavailable on the server` +** descrizione: `cause SASL authentication failure when SASL is requested but unavailable on the server; when this option is enabled, it has effect only if option "sasl_fail" is set to "reconnect" or "disconnect" in the server` ** tipo: bool ** valori: on, off (valore predefinito: `on`) @@ -573,7 +573,7 @@ ** valori: qualsiasi stringa (valore predefinito: `""`) * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail* -** descrizione: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server` +** descrizione: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server (see also option irc.network.sasl_fail_unavailable)` ** tipo: intero ** valori: continue, reconnect, disconnect (valore predefinito: `continue`) diff --git a/doc/ja/autogen/user/irc_options.asciidoc b/doc/ja/autogen/user/irc_options.asciidoc index fa58f4e43..6c7ab89d2 100644 --- a/doc/ja/autogen/user/irc_options.asciidoc +++ b/doc/ja/autogen/user/irc_options.asciidoc @@ -428,7 +428,7 @@ ** 値: 1 .. 10080 (デフォルト値: `5`) * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable* -** 説明: `cause SASL authentication failure when SASL is requested but unavailable on the server` +** 説明: `cause SASL authentication failure when SASL is requested but unavailable on the server; when this option is enabled, it has effect only if option "sasl_fail" is set to "reconnect" or "disconnect" in the server` ** タイプ: ブール ** 値: on, off (デフォルト値: `on`) @@ -573,7 +573,7 @@ ** 値: 未制約文字列 (デフォルト値: `""`) * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail* -** 説明: `SASL 認証が失敗した場合の挙動: 認証の問題を無視する場合は "continue"、サーバへの再接続を予定する場合は "reconnect"、サーバから切断する場合は "disconnect"` +** 説明: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server (see also option irc.network.sasl_fail_unavailable)` ** タイプ: 整数 ** 値: continue, reconnect, disconnect (デフォルト値: `continue`) diff --git a/doc/pl/autogen/user/irc_options.asciidoc b/doc/pl/autogen/user/irc_options.asciidoc index a2b4bb652..0982f71db 100644 --- a/doc/pl/autogen/user/irc_options.asciidoc +++ b/doc/pl/autogen/user/irc_options.asciidoc @@ -428,7 +428,7 @@ ** wartości: 1 .. 10080 (domyślna wartość: `5`) * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable* -** opis: `cause SASL authentication failure when SASL is requested but unavailable on the server` +** opis: `cause SASL authentication failure when SASL is requested but unavailable on the server; when this option is enabled, it has effect only if option "sasl_fail" is set to "reconnect" or "disconnect" in the server` ** typ: bool ** wartości: on, off (domyślna wartość: `on`) @@ -573,7 +573,7 @@ ** wartości: dowolny ciąg (domyślna wartość: `""`) * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail* -** opis: `akcja do wykonania jeśli uwierzytelnianie SASL się nie powiedzie: "continue" dla zignorowania problemu, "reconnect" ponownie połącz się z serwerem, "disconnect" odłącz od serwera` +** opis: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server (see also option irc.network.sasl_fail_unavailable)` ** typ: liczba ** wartości: continue, reconnect, disconnect (domyślna wartość: `continue`) diff --git a/po/cs.po b/po/cs.po index e4f1e0858..c8fde32b5 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -6990,7 +6990,8 @@ msgstr "časový limit (v sekundách) před vzdaním SASL autentizace" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -7634,7 +7635,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/de.po b/po/de.po index 438a54c1a..f70048534 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-02-19 17:53+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German <>\n" @@ -8063,10 +8063,12 @@ msgid "timeout (in seconds) before giving up SASL authentication" msgstr "" "Zeitüberschreitung bis zum Abbruch der SASL Authentifizierung (in Sekunden)" +#, fuzzy msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" "auszuführende Aktion falls die SASL Authentifizierung fehlschlägt: " "\"continue\" ignoriert das Problem, das bei der Authentifizierung " @@ -8891,7 +8893,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/es.po b/po/es.po index 3169fd1c4..509db745d 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -7238,7 +7238,8 @@ msgstr "" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -7927,7 +7928,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/fr.po b/po/fr.po index 2b693be04..d9bb3b50c 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: 2016-02-24 07:46+0100\n" -"PO-Revision-Date: 2016-02-24 07:47+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" +"PO-Revision-Date: 2016-02-25 07:33+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -7901,11 +7901,13 @@ msgstr "" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" "action à effectuer si l'authentification SASL échoue : \"continue\" pour " "ignorer le problème d'authentification, \"reconnect\" pour planifier une " -"reconnexion au serveur, \"disconnect\" pour se déconnecter du serveur" +"reconnexion au serveur, \"disconnect\" pour se déconnecter du serveur (voir " +"aussi l'option irc.network.sasl_fail_unavailable)" msgid "automatically connect to server when WeeChat is starting" msgstr "connexion automatique au serveur quand WeeChat démarre" @@ -8669,10 +8671,13 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" "provoquer un échec d'authentification SASL quand SASL est demandé mais non " -"disponible sur le serveur" +"disponible sur le serveur ; lorsque cette option est activée, elle n'a " +"d'effet que si l'option \"sasl_fail\" est égale à \"reconnect\" ou " +"\"disconnect\" dans le serveur" msgid "send unknown commands to server" msgstr "envoie les commandes inconnues au serveur" @@ -12594,3 +12599,10 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" + +#~ msgid "" +#~ "cause SASL authentication failure when SASL is requested but unavailable " +#~ "on the server" +#~ msgstr "" +#~ "provoquer un échec d'authentification SASL quand SASL est demandé mais " +#~ "non disponible sur le serveur" diff --git a/po/hu.po b/po/hu.po index 6a3da204e..0f3e792a8 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -6457,7 +6457,8 @@ msgstr "SSL használata a a kapcsolathoz" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -7038,7 +7039,8 @@ msgstr "két távollétellenőrzés közti idő (percben, 0 = nincs ellenőrzés msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" #, fuzzy diff --git a/po/it.po b/po/it.po index 5dfc97903..044e2920c 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -7391,7 +7391,8 @@ msgstr "timeout (in secondi) prima di annullare l'autenticazione SASL" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -8097,7 +8098,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/ja.po b/po/ja.po index 5822e2ddf..017018509 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-02-20 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -7583,10 +7583,12 @@ msgstr "" msgid "timeout (in seconds) before giving up SASL authentication" msgstr "SASL 認証を諦める前のタイムアウト (秒単位)" +#, fuzzy msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" "SASL 認証が失敗した場合の挙動: 認証の問題を無視する場合は \"continue\"、サー" "バへの再接続を予定する場合は \"reconnect\"、サーバから切断する場合は " @@ -8314,7 +8316,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/pl.po b/po/pl.po index 4d26e295d..71d99a26f 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -7736,10 +7736,12 @@ msgid "timeout (in seconds) before giving up SASL authentication" msgstr "" "czas oczekiwania (w sekundach) przed zaprzestaniem uwierzytelniania SASL" +#, fuzzy msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" "akcja do wykonania jeśli uwierzytelnianie SASL się nie powiedzie: \"continue" "\" dla zignorowania problemu, \"reconnect\" ponownie połącz się z serwerem, " @@ -8491,7 +8493,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/pt_BR.po b/po/pt_BR.po index 032cf36b1..f6bd9286a 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -6850,7 +6850,8 @@ msgstr "limite de tempo (sem segundos) antes de desistir da autenticação SASL" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -7463,7 +7464,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/ru.po b/po/ru.po index 8aa7fca65..24666115f 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-17 08:52+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -6487,7 +6487,8 @@ msgstr "использовать SSL при связи с сервером" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -7071,7 +7072,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" #, fuzzy diff --git a/po/tr.po b/po/tr.po index 4419508fa..1f15339f5 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2016-01-05 07:51+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -5805,7 +5805,8 @@ msgstr "" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -6336,7 +6337,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/po/weechat.pot b/po/weechat.pot index 1098f1e89..fd13fa9d2 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: 2016-02-24 07:46+0100\n" +"POT-Creation-Date: 2016-02-25 07:30+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -5729,7 +5729,8 @@ msgstr "" msgid "" "action to perform if SASL authentication fails: \"continue\" to ignore the " "authentication problem, \"reconnect\" to schedule a reconnection to the " -"server, \"disconnect\" to disconnect from server" +"server, \"disconnect\" to disconnect from server (see also option irc." +"network.sasl_fail_unavailable)" msgstr "" msgid "automatically connect to server when WeeChat is starting" @@ -6257,7 +6258,8 @@ msgstr "" msgid "" "cause SASL authentication failure when SASL is requested but unavailable on " -"the server" +"the server; when this option is enabled, it has effect only if option " +"\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server" msgstr "" msgid "send unknown commands to server" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index b30d379f6..3c590fedd 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -1796,7 +1796,8 @@ irc_config_server_new_option (struct t_config_file *config_file, N_("action to perform if SASL authentication fails: " "\"continue\" to ignore the authentication problem, " "\"reconnect\" to schedule a reconnection to the server, " - "\"disconnect\" to disconnect from server"), + "\"disconnect\" to disconnect from server " + "(see also option irc.network.sasl_fail_unavailable)"), "continue|reconnect|disconnect", 0, 0, default_value, value, null_value_allowed, @@ -3009,7 +3010,9 @@ irc_config_init () irc_config_file, ptr_section, "sasl_fail_unavailable", "boolean", N_("cause SASL authentication failure when SASL is requested but " - "unavailable on the server"), + "unavailable on the server; when this option is enabled, it has " + "effect only if option \"sasl_fail\" is set to \"reconnect\" or " + "\"disconnect\" in the server"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_network_send_unknown_commands = weechat_config_new_option ( irc_config_file, ptr_section,