From 5284921701801de70f74aab39704128c2536e285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 17 Sep 2022 12:12:06 +0200 Subject: [PATCH] irc: fix message when disconnecting from server in case of high lag when server option autoreconnect is off (closes #1708) --- ChangeLog.adoc | 1 + po/cs.po | 4 ++-- po/de.po | 7 ++++--- po/es.po | 4 ++-- po/fr.po | 8 ++++---- po/hu.po | 4 ++-- po/it.po | 7 ++++--- po/ja.po | 7 ++++--- po/pl.po | 7 ++++--- po/pt.po | 7 ++++--- po/pt_BR.po | 7 ++++--- po/ru.po | 4 ++-- po/sr.po | 7 ++++--- po/tr.po | 7 ++++--- po/weechat.pot | 4 ++-- src/plugins/irc/irc-server.c | 2 +- 16 files changed, 48 insertions(+), 39 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 0e25b7b7f..d2312e9b5 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -46,6 +46,7 @@ Bug fixes:: * irc: fix target buffer of generic errors when they contain a target nick (issue #1814) * irc: fix display of message 350 (whois, gateway) (issue #1815) * irc: replace chars "\01" by spaces in CTCP replies (issue #1819) + * irc: fix message when disconnecting from server in case of high lag when server option autoreconnect is off (issue #1708) * guile: fix function hdata_get_string * javascript: fix return of long value in functions infolist_time, hdata_long and hdata_time * php: fix function hdata_compare diff --git a/po/cs.po b/po/cs.po index 66766903f..ad4c1d45c 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-06-18 16:11+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -10008,7 +10008,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, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: znovupřipojení k serveru v %d %s, %d %s" #, c-format diff --git a/po/de.po b/po/de.po index 1dba20b59..dec4d26ae 100644 --- a/po/de.po +++ b/po/de.po @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-09-16 08:22+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -12269,8 +12269,9 @@ msgstr "" msgid "%s%s: SASL authentication timeout" msgstr "%s%s: Zeitüberschreitung bei SASL Authentifizierung" -#, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "" "%s%s: Verzögerung ist zu hoch. Es wird eine neue Verbindung zum Server " "%s%s%s hergestellt" diff --git a/po/es.po b/po/es.po index e5fa15480..73fc6fc4d 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-06-18 16:11+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -10665,7 +10665,7 @@ msgid "%s%s: SASL authentication timeout" msgstr "%s%s: la autenticación SASL agotó el tiempo de espera" #, fuzzy, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from 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 933d78d98..9a76c589d 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: 2022-09-17 09:34+0200\n" -"PO-Revision-Date: 2022-09-17 09:36+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" +"PO-Revision-Date: 2022-09-17 12:10+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -12015,8 +12015,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, reconnecting to server %s%s%s" -msgstr "%s%s : le lag est élevé, reconnexion au serveur %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" +msgstr "%s%s : le lag est élevé, déconnexion du 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 a89d4ebb1..79f07cda2 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -9495,7 +9495,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, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from 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 c26895aa6..0441d2483 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -10460,8 +10460,9 @@ 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, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: ritardo eccessivo, riconnessione dal server %s%s%s" #, c-format diff --git a/po/ja.po b/po/ja.po index a1dcf99d6..abd882174 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-06-18 16:12+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -12000,8 +12000,9 @@ 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, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: za duże opóźnienie, łączę ponownie z serwerem %s%s%s" #, c-format diff --git a/po/pt.po b/po/pt.po index ad21fce41..a2fc1de56 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-06-18 16:12+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -11267,8 +11267,9 @@ msgstr "%s%s: tempo de conexão excedido (mensagem 001 não recebida)" msgid "%s%s: SASL authentication timeout" msgstr "%s%s: tempo de autenticação SASL excedido" -#, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: a lag está elevada, a reconectar ao servidor %s%s%s" # "%d %s, %d %s" at the end is n minutes, m seconds diff --git a/po/pt_BR.po b/po/pt_BR.po index 7eae6240a..fc3a6048b 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -9976,8 +9976,9 @@ msgstr "%s%s: tempo de conexão esgotado (mensagem 001 não recebida)" msgid "%s%s: SASL authentication timeout" msgstr "%s%s: tempo de autenticação SASL esgotado" -#, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: lag está alto, reconectando ao servidor %s%s%s" #, c-format diff --git a/po/ru.po b/po/ru.po index d27556d0e..8169b0c66 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -9537,7 +9537,7 @@ msgid "%s%s: SASL authentication timeout" msgstr "Не могу записать лог-файл \"%s\"\n" #, fuzzy, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s задержка слишком высокая, отключаюсь от сервера...\n" #, fuzzy, c-format diff --git a/po/sr.po b/po/sr.po index 20716196f..5807f6121 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-07-06 08:29+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -11717,8 +11717,9 @@ msgstr "%s%s: тајмаут везе (није примљена порука 00 msgid "%s%s: SASL authentication timeout" msgstr "%s%s: тајмаут SASL аутентификације" -#, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: кашњење је велико, поново се успоставља веза са сервером %s%s%s" #, c-format diff --git a/po/tr.po b/po/tr.po index 4cdd59adf..cca6071c6 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2022-07-27 23:00+0300\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -11625,8 +11625,9 @@ msgstr "%s%s: Bağlantı zaman aşımı (001 iletisi alınmadı)" msgid "%s%s: SASL authentication timeout" msgstr "%s%s: SASL kimlik doğrulama zaman aşımı" -#, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +#, fuzzy, c-format +#| msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "%s%s: Gecikme çok yüksek, %s%s%s sunucusuna yeniden bağlanılıyor" #, c-format diff --git a/po/weechat.pot b/po/weechat.pot index 9dcbca4d7..5a6129d4c 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: 2022-09-17 09:34+0200\n" +"POT-Creation-Date: 2022-09-17 12:09+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -8548,7 +8548,7 @@ msgid "%s%s: SASL authentication timeout" msgstr "" #, c-format -msgid "%s%s: lag is high, reconnecting to server %s%s%s" +msgid "%s%s: lag is high, disconnecting from server %s%s%s" msgstr "" #, c-format diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 143d78d71..499dd151a 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -3831,7 +3831,7 @@ irc_server_timer_cb (const void *pointer, void *data, int remaining_calls) { weechat_printf ( ptr_server->buffer, - _("%s%s: lag is high, reconnecting to server %s%s%s"), + _("%s%s: lag is high, disconnecting from server %s%s%s"), weechat_prefix ("network"), IRC_PLUGIN_NAME, IRC_COLOR_CHAT_SERVER,