summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-03-12 18:35:03 +0100
committerSebastien Helleu <flashcode@flashtux.org>2013-03-12 18:35:03 +0100
commit7cf9c8a656b3da59b80b3525b9f9dde9212e5c10 (patch)
treefb4a640e86b2388d0d73582bf984a146ffeb6dc9
parentafc1dd4f6b0ff1768b3e3565b2db5c3bfb182259 (diff)
downloadweechat-7cf9c8a656b3da59b80b3525b9f9dde9212e5c10.zip
irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect, value is now a number of seconds
-rw-r--r--ChangeLog4
-rw-r--r--NEWS7
-rw-r--r--doc/de/autogen/user/irc_options.txt10
-rw-r--r--doc/en/autogen/user/irc_options.txt10
-rw-r--r--doc/fr/autogen/user/irc_options.txt10
-rw-r--r--doc/it/autogen/user/irc_options.txt10
-rw-r--r--doc/ja/autogen/user/irc_options.txt10
-rw-r--r--po/cs.po9
-rw-r--r--po/de.po11
-rw-r--r--po/es.po11
-rw-r--r--po/fr.po15
-rw-r--r--po/hu.po9
-rw-r--r--po/it.po11
-rw-r--r--po/ja.po11
-rw-r--r--po/pl.po11
-rw-r--r--po/pt_BR.po11
-rw-r--r--po/ru.po9
-rw-r--r--po/weechat.pot8
-rw-r--r--src/plugins/irc/irc-config.c12
-rw-r--r--src/plugins/irc/irc-config.h2
-rw-r--r--src/plugins/irc/irc-server.c14
21 files changed, 125 insertions, 80 deletions
diff --git a/ChangeLog b/ChangeLog
index 9111a3162..332b2f25d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-03-11
+v0.4.1-dev, 2013-03-12
This document lists all changes for each version.
@@ -41,6 +41,8 @@ Version 0.4.1 (under dev!)
list with arguments inside), guile >= 2.0 is now required (bug #38350)
* guile: fix crash on calls to callbacks during load of script (bug #38343)
* guile: fix compilation with guile 2.0
+* irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect,
+ value is now a number of seconds
* irc: hide passwords in commands or messages sent to nickserv (/msg nickserv)
with new modifiers "irc_command_auth" and "irc_message_auth", remove option
irc.look.hide_nickserv_pwd, add option irc.look.nicks_hide_password
diff --git a/NEWS b/NEWS
index a0482fbcb..67f1929ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
WeeChat Release Notes
=====================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-02-26
+v0.4.1-dev, 2013-03-12
This document lists important changes for each version, that require manual
@@ -16,6 +16,11 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
Version 0.4.1 (under dev!)
--------------------------
+=== IRC reconnection on important lag ===
+
+Option 'irc.network.lag_disconnect' has been renamed to
+'irc.network.lag_reconnect' and value is now a number of seconds.
+
=== IRC passwords hidden ===
IRC plugin is now using modifiers "irc_command_auth" and "irc_message_auth" to
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index 59b5e697a..f6635e3de 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -353,16 +353,16 @@
** Typ: integer
** Werte: 0 .. 604800 (Standardwert: `60`)
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** Beschreibung: `maximal Verzögerung (Lag) bis zum Trennen der Verbindung (in Minuten - 0 = niemals trennen)`
-** Typ: integer
-** Werte: 0 .. 10080 (Standardwert: `0`)
-
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** Beschreibung: `geringste Verzögerungszeit (Lag) die angezeigt werden soll (in Millisekunden)`
** Typ: integer
** Werte: 0 .. 86400000 (Standardwert: `500`)
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** Beschreibung: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
+** Typ: integer
+** Werte: 0 .. 604800 (Standardwert: `0`)
+
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** Beschreibung: `Intervall zwischen zwei Aktualisierungen der Verzögerungsanzeige (Lag-Item), wenn die Verzögerungszeit sich erhöht (in Sekunden)`
** Typ: integer
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 6a842ce01..505c74179 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -353,16 +353,16 @@
** type: integer
** values: 0 .. 604800 (default value: `60`)
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** description: `disconnect after important lag (in minutes, 0 = never disconnect)`
-** type: integer
-** values: 0 .. 10080 (default value: `0`)
-
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** description: `minimum lag to show (in milliseconds)`
** type: integer
** values: 0 .. 86400000 (default value: `500`)
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** description: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
+** type: integer
+** values: 0 .. 604800 (default value: `0`)
+
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** description: `interval between two refreshs of lag item, when lag is increasing (in seconds)`
** type: integer
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index e362ee79f..2c7b76af3 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -353,16 +353,16 @@
** type: entier
** valeurs: 0 .. 604800 (valeur par défaut: `60`)
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** description: `déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)`
-** type: entier
-** valeurs: 0 .. 10080 (valeur par défaut: `0`)
-
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** description: `lag minimum à afficher (en millisecondes)`
** type: entier
** valeurs: 0 .. 86400000 (valeur par défaut: `500`)
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** description: `se reconnecter au serveur si le lag est supérieur à cette valeur (en secondes, 0 = ne jamais se reconnecter)`
+** type: entier
+** valeurs: 0 .. 604800 (valeur par défaut: `0`)
+
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** description: `intervalle entre deux rafraichissements du lag, lorsque le lag augmente (en secondes)`
** type: entier
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index 868c4cdbb..f0685cdab 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -353,16 +353,16 @@
** tipo: intero
** valori: 0 .. 604800 (valore predefinito: `60`)
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** descrizione: `disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)`
-** tipo: intero
-** valori: 0 .. 10080 (valore predefinito: `0`)
-
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** descrizione: `ritardo minimo da visualizzare (in millisecondi)`
** tipo: intero
** valori: 0 .. 86400000 (valore predefinito: `500`)
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** descrizione: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
+** tipo: intero
+** valori: 0 .. 604800 (valore predefinito: `0`)
+
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** descrizione: `intervallo tra due aggiornamenti per l'elemento ritardo, quando è in aumento (in secondi)`
** tipo: intero
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index 766e584b9..cc559bf77 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -353,16 +353,16 @@
** タイプ: 整数
** 値: 0 .. 604800 (デフォルト値: `60`)
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** 説明: `長い遅延の後は再接続 (分単位、0 = 再接続しない)`
-** タイプ: 整数
-** 値: 0 .. 10080 (デフォルト値: `0`)
-
* [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
** 説明: `表示する最短の遅延 (ミリ秒単位)`
** タイプ: 整数
** 値: 0 .. 86400000 (デフォルト値: `500`)
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** 説明: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
+** タイプ: 整数
+** 値: 0 .. 604800 (デフォルト値: `0`)
+
* [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
** 説明: `遅延時間が増加する場合、遅延アイテムの 2 回のリフレッシュの間のインターバル (秒単位)`
** タイプ: 整数
diff --git a/po/cs.po b/po/cs.po
index 53badbd80..0cef051c8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6226,7 +6226,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "minimální lag, který zobrazit (v milisekundách)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr "odpojit po závažném lagu (v minutách, 0 = nikny neodpojit)"
msgid ""
@@ -6917,7 +6920,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: vypršel čas pro sasl autentizaci"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s: zpoždění je veliké, odpojuji se od serveru..."
#, fuzzy, c-format
diff --git a/po/de.po b/po/de.po
index eb8b73118..b2f0b6d8b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-11 11:28+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-03-10 09:40+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -6894,7 +6894,10 @@ msgid "minimum lag to show (in milliseconds)"
msgstr ""
"geringste Verzögerungszeit (Lag) die angezeigt werden soll (in Millisekunden)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
"maximal Verzögerung (Lag) bis zum Trennen der Verbindung (in Minuten - 0 = "
"niemals trennen)"
@@ -7599,8 +7602,8 @@ msgstr ""
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: Zeitüberschreitung bei SASL Authentifizierung"
-#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+#, fuzzy, c-format
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: Verzögerung ist zu hoch, die Verbindung wird getrennt..."
#, c-format
diff --git a/po/es.po b/po/es.po
index 9fd24dfc7..43859c50e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6480,7 +6480,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "retraso mínimo a mostrar (en milisegundos)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
"desconexión tras un retraso importante (en minutos, 0 = no desconectar nunca)"
@@ -7166,8 +7169,8 @@ msgstr "%s%s: tiempo de conexión agotado (mensaje 001 no recibido)"
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: la autenticación SASL agotó el tiempo de espera"
-#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+#, fuzzy, c-format
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: el retraso es alto, desconectando del servidor..."
#, c-format
diff --git a/po/fr.po b/po/fr.po
index a22219a7c..664f37ad8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
-"PO-Revision-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 18:32+0100\n"
+"PO-Revision-Date: 2013-03-12 13:54+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -6692,9 +6692,12 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "lag minimum à afficher (en millisecondes)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
-"déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)"
+"se reconnecter au serveur si le lag est supérieur à cette valeur (en "
+"secondes, 0 = ne jamais se reconnecter)"
msgid ""
"interval between two refreshs of lag item, when lag is increasing (in "
@@ -7382,8 +7385,8 @@ msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: délai d'authentification sasl dépassé"
#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
-msgstr "%s%s: le lag est élevé, déconnexion du serveur..."
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
+msgstr "%s%s: le lag est élevé, reconnexion au serveur %s%s%s"
#, c-format
msgid "%s%s: reconnecting to server in %d %s, %d %s"
diff --git a/po/hu.po b/po/hu.po
index 82d0eb7e9..28f5de92c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5760,7 +5760,10 @@ msgstr "két távollétellenőrzés közti idő (percben, 0 = nincs ellenőrzés
msgid "minimum lag to show (in milliseconds)"
msgstr "minimális kijelzett késés (másodpercben)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr "lekapcsolódás túl nagy késés esetén (percben, 0 = nincs lecsatlakozás)"
#, fuzzy
@@ -6446,7 +6449,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
#, fuzzy, c-format
diff --git a/po/it.po b/po/it.po
index 7acd9ca09..1e9ab0d7f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6502,7 +6502,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "ritardo minimo da visualizzare (in millisecondi)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
"disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)"
@@ -7186,8 +7189,8 @@ msgstr "%s%s: timeout della connessione (messaggio 001 non ricevuto)"
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: timeout dell'autenticazione sasl"
-#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+#, fuzzy, c-format
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: ritardo eccessivo, disconnessione dal server..."
#, c-format
diff --git a/po/ja.po b/po/ja.po
index 46ba71aaa..dd26aa5fa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -6441,7 +6441,10 @@ msgstr "遅延の確認間のインターバル (秒単位、0 = 確認しない
msgid "minimum lag to show (in milliseconds)"
msgstr "表示する最短の遅延 (ミリ秒単位)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr "長い遅延の後は再接続 (分単位、0 = 再接続しない)"
msgid ""
@@ -7119,8 +7122,8 @@ msgstr "%s%s: 接続タイムアウト (メッセージ 001 が受信されま
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: sasl 認証タイムアウト"
-#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+#, fuzzy, c-format
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: ラグが長いです、サーバとの接続を切断中..."
#, c-format
diff --git a/po/pl.po b/po/pl.po
index 7b09e8546..e251ef4ce 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6577,7 +6577,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "minimalne pokazywane opóźnienie (w milisekundach)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr "rozłącz po dużym opóźnieniu (w minutach, 0 = nie rozłączaj nigdy)"
msgid ""
@@ -7257,8 +7260,8 @@ msgstr "%s%s: przekroczono czas połączenia (nie otrzymano wiadomości 001)"
msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: przekroczono czas uwierzytelniania sasl"
-#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+#, fuzzy, c-format
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s%s: za duże opóźnienie, rozłączam z serwerem..."
#, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index eae728d4f..b5f881bec 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:12+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5933,8 +5933,13 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr ""
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
+"intervalo entre duas verificações de ausente (em minutos, 0 = nunca "
+"verificar)"
msgid ""
"interval between two refreshs of lag item, when lag is increasing (in "
@@ -6612,7 +6617,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "%s%s: tempo de autenticação sasl esgotado"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s: desconectando do servidor..."
#, fuzzy, c-format
diff --git a/po/ru.po b/po/ru.po
index 337768210..f3be83daa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-23 11:12+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5782,7 +5782,10 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr "минимальная отображаемая задержка (в секундах)"
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+#, fuzzy
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
"отключаться при серьёзной задержке (в минутах, 0 = не отключаться никогда)"
@@ -6476,7 +6479,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr "Не могу записать лог-файл \"%s\"\n"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr "%s задержка слишком высокая, отключаюсь от сервера...\n"
#, fuzzy, c-format
diff --git a/po/weechat.pot b/po/weechat.pot
index 4288c9524..5e08031d1 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-10 08:54+0100\n"
+"POT-Creation-Date: 2013-03-12 13:52+0100\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5022,7 +5022,9 @@ msgstr ""
msgid "minimum lag to show (in milliseconds)"
msgstr ""
-msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
+msgid ""
+"reconnect to server if lag is greater than this value (in seconds, 0 = never "
+"reconnect)"
msgstr ""
msgid ""
@@ -5669,7 +5671,7 @@ msgid "%s%s: sasl authentication timeout"
msgstr ""
#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s%s: lag is high, reconnecting to server %s%s%s"
msgstr ""
#, c-format
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index d7f90517b..95bbf318f 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -126,7 +126,7 @@ struct t_config_option *irc_config_network_colors_receive;
struct t_config_option *irc_config_network_colors_send;
struct t_config_option *irc_config_network_lag_check;
struct t_config_option *irc_config_network_lag_min_show;
-struct t_config_option *irc_config_network_lag_disconnect;
+struct t_config_option *irc_config_network_lag_reconnect;
struct t_config_option *irc_config_network_lag_refresh_interval;
struct t_config_option *irc_config_network_notify_check_ison;
struct t_config_option *irc_config_network_notify_check_whois;
@@ -2552,12 +2552,12 @@ irc_config_init ()
N_("minimum lag to show (in milliseconds)"),
NULL, 0, 1000 * 3600 * 24, "500", NULL, 0, NULL, NULL,
&irc_config_change_network_lag_min_show, NULL, NULL, NULL);
- irc_config_network_lag_disconnect = weechat_config_new_option (
+ irc_config_network_lag_reconnect = weechat_config_new_option (
irc_config_file, ptr_section,
- "lag_disconnect", "integer",
- N_("disconnect after important lag (in minutes, 0 = never "
- "disconnect)"),
- NULL, 0, 60 * 24 * 7, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+ "lag_reconnect", "integer",
+ N_("reconnect to server if lag is greater than this value (in seconds, "
+ "0 = never reconnect)"),
+ NULL, 0, 3600 * 24 * 7, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_network_lag_refresh_interval = weechat_config_new_option (
irc_config_file, ptr_section,
"lag_refresh_interval", "integer",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index c14aabb05..47ea1bee6 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -157,7 +157,7 @@ extern struct t_config_option *irc_config_network_colors_receive;
extern struct t_config_option *irc_config_network_colors_send;
extern struct t_config_option *irc_config_network_lag_check;
extern struct t_config_option *irc_config_network_lag_min_show;
-extern struct t_config_option *irc_config_network_lag_disconnect;
+extern struct t_config_option *irc_config_network_lag_reconnect;
extern struct t_config_option *irc_config_network_lag_refresh_interval;
extern struct t_config_option *irc_config_network_notify_check_ison;
extern struct t_config_option *irc_config_network_notify_check_whois;
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 771368c3f..ddf31a395 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -47,6 +47,7 @@
#include "irc-server.h"
#include "irc-buffer.h"
#include "irc-channel.h"
+#include "irc-color.h"
#include "irc-command.h"
#include "irc-config.h"
#include "irc-input.h"
@@ -2821,14 +2822,17 @@ irc_server_timer_cb (void *data, int remaining_calls)
weechat_bar_item_update ("lag");
}
/* lag timeout? => disconnect */
- if ((weechat_config_integer (irc_config_network_lag_disconnect) > 0)
- && (ptr_server->lag / 1000 > weechat_config_integer (irc_config_network_lag_disconnect) * 60))
+ if ((weechat_config_integer (irc_config_network_lag_reconnect) > 0)
+ && (ptr_server->lag / 1000 > weechat_config_integer (irc_config_network_lag_reconnect)))
{
weechat_printf (ptr_server->buffer,
- _("%s%s: lag is high, disconnecting "
- "from server..."),
+ _("%s%s: lag is high, reconnecting to "
+ "server %s%s%s"),
weechat_prefix ("network"),
- IRC_PLUGIN_NAME);
+ IRC_PLUGIN_NAME,
+ IRC_COLOR_CHAT_SERVER,
+ ptr_server->name,
+ IRC_COLOR_RESET);
irc_server_disconnect (ptr_server, 0, 1);
}
}