diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d471233d..1a97c1da0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Added -- relay: display connection status in input prompt of remote buffers, if not connected or if synchronizing data with the remote +- relay: display connection status in input prompt of remote buffers, if not connected or if fetching data from remote ### Fixed diff --git a/po/cs.po b/po/cs.po index 4bceaaef8..ded481c08 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -14024,7 +14024,7 @@ msgstr "%s%s: nemohu se připojit k odesílateli" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: nedostatek paměti pro rozdělení zprávy" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/de.po b/po/de.po index 29bf26033..933b5f8fd 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-24 10:45+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -15390,7 +15390,7 @@ msgstr "" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: Nicht genug Speicher vorhanden um Nachricht zu parsen" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/es.po b/po/es.po index c8b5bdd3c..4069abb38 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -14366,7 +14366,7 @@ msgstr "%s%s: no es posible conectarse al transmisor" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: memoria insuficiente para analizar el mensaje" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/fr.po b/po/fr.po index c915f8d4e..7c7c6f229 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: 2024-08-24 10:59+0200\n" -"PO-Revision-Date: 2024-08-24 11:00+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" +"PO-Revision-Date: 2024-08-24 11:22+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -15079,8 +15079,8 @@ msgstr "remote[%s] : impossible de se connecter, pas assez de mémoire" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s : pas assez de mémoire pour analyser le message" -msgid "data synchronization" -msgstr "synchronisation des données" +msgid "fetching data" +msgstr "récupération des données" msgid "Actions (letter+enter):" msgstr "Actions (lettre+entrée) :" @@ -18334,3 +18334,6 @@ msgid "" msgstr "" "%s%s : impossible d'accepter de continuer le fichier \"%s\" (port : %d, " "position de départ : %llu) : xfer non trouvé ou non prêt pour le transfert" + +#~ msgid "data synchronization" +#~ msgstr "synchronisation des données" diff --git a/po/hu.po b/po/hu.po index 11260ae19..4868213ab 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -13422,7 +13422,7 @@ msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" msgid "%s%s: not enough memory for parsing message" msgstr "%s nincs elegendő memória a fogadott IRC üzenet számára\n" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/it.po b/po/it.po index 82d7ff5ab..a14bde87b 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -14376,7 +14376,7 @@ msgstr "%s%s: impossibile connettersi al mittente" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: memoria non sufficiente per verificare il messaggio" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/ja.po b/po/ja.po index 003d627e4..c9e9ba5eb 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: weechat-dev \n" @@ -14792,7 +14792,7 @@ msgstr "remote[%s]: połączenie nie powiodło się, za mało pamięci" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: za mało pamięci na przetworzenie otrzymanych wiadomości" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/pt.po b/po/pt.po index dade88338..1566f119f 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -14727,7 +14727,7 @@ msgstr "%s%s: não foi possível conectar para enviar" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: memória insuficiente para analisar a mensagem" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/pt_BR.po b/po/pt_BR.po index c5603dd2c..a8c6c463d 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -13878,7 +13878,7 @@ msgstr "%s%s: não foi possível conectar ao remetente" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: memória insuficiente para interpretar mensagem" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/ru.po b/po/ru.po index 0792e0dd6..c362028d8 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -13475,7 +13475,7 @@ msgstr "%s DCC: не могу соединиться с отправителем msgid "%s%s: not enough memory for parsing message" msgstr "%s недостаточно памяти для полученного сообщения\n" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/sr.po b/po/sr.po index f3c831385..b26ce0381 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-24 10:56+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -14684,7 +14684,7 @@ msgstr "удаљени[%s]: није успело повезивање, нема msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: нема довољно слободне меморије за парсирање поруке" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/tr.po b/po/tr.po index 30ee37cea..37fdd86e8 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2024-08-12 21:36+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -14997,7 +14997,7 @@ msgstr "%s%s: Göndericiye bağlanılamıyor" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: ayrıştırma iletisi için bellek yetersiz" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/po/weechat.pot b/po/weechat.pot index 85a944fb2..c2ff48214 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: 2024-08-24 10:59+0200\n" +"POT-Creation-Date: 2024-08-24 11:22+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -12271,7 +12271,7 @@ msgstr "" msgid "%s%s: not enough memory for parsing message" msgstr "" -msgid "data synchronization" +msgid "fetching data" msgstr "" msgid "Actions (letter+enter):" diff --git a/src/plugins/relay/relay-bar-item.c b/src/plugins/relay/relay-bar-item.c index 1f098a651..4537a3c0f 100644 --- a/src/plugins/relay/relay-bar-item.c +++ b/src/plugins/relay/relay-bar-item.c @@ -41,6 +41,7 @@ relay_bar_item_input_prompt (const void *pointer, void *data, struct t_hashtable *extra_info) { char str_status[512], *input_prompt; + int fetching_data; const char *ptr_input_prompt; struct t_relay_remote *ptr_remote; @@ -58,18 +59,18 @@ relay_bar_item_input_prompt (const void *pointer, void *data, ptr_remote = relay_remote_search (weechat_buffer_get_string (buffer, "localvar_relay_remote")); if (ptr_remote) { - if ((ptr_remote->status == RELAY_STATUS_CONNECTED) && !ptr_remote->synced) - { - snprintf (str_status, sizeof (str_status), - "<%s>", _("data synchronization")); - } - else if (ptr_remote->status != RELAY_STATUS_CONNECTED) + fetching_data = (ptr_remote->status == RELAY_STATUS_CONNECTED) + && !ptr_remote->synced; + if ((ptr_remote->status != RELAY_STATUS_CONNECTED) || fetching_data) { snprintf ( str_status, sizeof (str_status), - "%s<%s>", + "%s<%s%s%s%s>", weechat_color (weechat_config_string (relay_config_color_status[ptr_remote->status])), - _(relay_status_string[ptr_remote->status])); + _(relay_status_string[ptr_remote->status]), + (fetching_data) ? " (" : "", + (fetching_data) ? _("fetching data") : "", + (fetching_data) ? ")" : ""); } }