diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e04ed81..e3e7b3388 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - **breaking:** alias: display an error with `/alias add` or `/alias addcompletion` when the alias already exists, add options `addreplace` and `addreplacecompletion` in command `/alias` ([#2095](https://github.com/weechat/weechat/issues/2095)) - core: add option `addreplace` in commands `/bar` and `/proxy` ([#2095](https://github.com/weechat/weechat/issues/2095)) +- irc: add option `addreplace` in command `/ignore` ([#2095](https://github.com/weechat/weechat/issues/2095)) - relay: enable websocket extension "permessage-deflate" with "api" relay only ([#1549](https://github.com/weechat/weechat/issues/1549)) ### Added diff --git a/po/cs.po b/po/cs.po index 1ed139cb2..8f2a33704 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -8396,6 +8396,11 @@ msgstr "%s: žádné ignorování v seznamu" msgid "%s%s: ignore already exists" msgstr "%s%s: ignorování již existuje" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: přidáno ignorování:" + #, c-format msgid "%s: ignore added:" msgstr "%s: přidáno ignorování:" @@ -9214,7 +9219,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignorovat přezdívky/hosty na serveru nebo kanálu" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" #, fuzzy @@ -9225,6 +9234,9 @@ msgstr "seznam pro IRC ignorování" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/de.po b/po/de.po index 1380267f1..c08ec6637 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-05-31 20:32+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -9634,6 +9634,11 @@ msgstr "%s keine Ignorierungen vorhanden" msgid "%s%s: ignore already exists" msgstr "%s%s: diese Ignorierung existiert bereits" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: Ignorierung hinzugefügt:" + #, c-format msgid "%s: ignore added:" msgstr "%s: Ignorierung hinzugefügt:" @@ -10438,7 +10443,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "Ignoriert Nicks/Hosts von Kanälen oder Servern" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" msgid "raw[list]: list all ignores" @@ -10447,6 +10456,13 @@ msgstr "raw[list]: zeigt alle Ignorierungen an" msgid "raw[add]: add an ignore" msgstr "raw[add]: fügt eine Ignorierung hinzu" +#, fuzzy +#| msgid "raw[addreplace]: add or replace an existing trigger" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" +"raw[addreplace]: erzeugt neuen Trigger oder ersetzt einen schon " +"existierenden Trigger" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/es.po b/po/es.po index d252a55bf..983a40539 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -8589,6 +8589,11 @@ msgstr "%s: lista de ignorados vacía" msgid "%s%s: ignore already exists" msgstr "%s%s: ya se encuentra ignorado" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: agregado a la lista de ignorados:" + #, c-format msgid "%s: ignore added:" msgstr "%s: agregado a la lista de ignorados:" @@ -9410,7 +9415,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignorar apodos/hosts en servidores o canales" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" #, fuzzy @@ -9421,6 +9430,9 @@ msgstr "lista de IRC ignores" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/fr.po b/po/fr.po index 2d598207e..ed17152dd 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-06-09 14:41+0200\n" -"PO-Revision-Date: 2024-06-09 14:42+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" +"PO-Revision-Date: 2024-06-09 15:30+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -9428,6 +9428,10 @@ msgstr "%s : pas d'ignore dans la liste" msgid "%s%s: ignore already exists" msgstr "%s%s : l'ignore existe déjà" +#, c-format +msgid "%s: ignore updated:" +msgstr "%s : ignore mis à jour :" + #, c-format msgid "%s: ignore added:" msgstr "%s : ignore ajouté :" @@ -10214,8 +10218,12 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignorer des pseudos/hôtes de serveurs ou canaux" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" -msgstr "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" +msgstr "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgid "raw[list]: list all ignores" msgstr "raw[list] : lister tous les ignores" @@ -10223,6 +10231,9 @@ msgstr "raw[list] : lister tous les ignores" msgid "raw[add]: add an ignore" msgstr "raw[add] : ajouter un ignore" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "raw[addreplace] : ajouter ou remplacer un ignore existant" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/hu.po b/po/hu.po index 97a58a3fd..b7c915367 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -8027,6 +8027,10 @@ msgstr "%s nem található ilyen mellőzés\n" msgid "%s%s: ignore already exists" msgstr "%s az ignore már létezik\n" +#, fuzzy, c-format +msgid "%s: ignore updated:" +msgstr "Nincs mellőzés megadva.\n" + #, fuzzy, c-format msgid "%s: ignore added:" msgstr "Nincs mellőzés megadva.\n" @@ -8808,7 +8812,9 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "" #, fuzzy @@ -8818,6 +8824,9 @@ msgstr "IRC szerver portja" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/it.po b/po/it.po index a77c1a517..dd77b1a22 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -8583,6 +8583,11 @@ msgstr "%s: nessun ignore nella lista" msgid "%s%s: ignore already exists" msgstr "%s%s: l'ignore esiste già" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: ignore aggiunto:" + #, c-format msgid "%s: ignore added:" msgstr "%s: ignore aggiunto:" @@ -9405,7 +9410,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignora nick/host dai server o dai canali" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" #, fuzzy @@ -9416,6 +9425,9 @@ msgstr "elenco di ignore IRC" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/ja.po b/po/ja.po index dc2d0cf63..8a67feef4 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese ") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" #, fuzzy @@ -9705,6 +9714,9 @@ msgstr "IRC 無視のリスト" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/pl.po b/po/pl.po index 2273f51b7..0ba999fb0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9138,6 +9138,11 @@ msgstr "%s: brak osób ignorowanych" msgid "%s%s: ignore already exists" msgstr "%s%s: już jest ignorowane" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: dodano nowy wpis na listę ignorowanych:" + #, c-format msgid "%s: ignore added:" msgstr "%s: dodano nowy wpis na listę ignorowanych:" @@ -9903,7 +9908,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignoruje nicki/hosty z serwera lub kanałów" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" msgid "raw[list]: list all ignores" @@ -9912,6 +9921,11 @@ msgstr "raw[list]: wyświetla wszystkich ignorowanych" msgid "raw[add]: add an ignore" msgstr "raw[add]: dodaj ignorowanie" +#, fuzzy +#| msgid "raw[addreplace]: add or replace an existing trigger" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "raw[addreplace]: dodaj lub zastąp istniejący trigger" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/pt.po b/po/pt.po index 921aa2a7d..802a53ff7 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -8829,6 +8829,11 @@ msgstr "%s: nenhum ignorado na lista" msgid "%s%s: ignore already exists" msgstr "%s%s: já é ignorado" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: ignorado adicionado:" + #, c-format msgid "%s: ignore added:" msgstr "%s: ignorado adicionado:" @@ -9677,7 +9682,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignorar nicks/hosts de servidores ou canais" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" #, fuzzy @@ -9688,6 +9697,9 @@ msgstr "lista de ignorados no IRC" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/pt_BR.po b/po/pt_BR.po index e7c598f92..784387454 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -8460,6 +8460,10 @@ msgstr "" msgid "%s%s: ignore already exists" msgstr "" +#, fuzzy, c-format +msgid "%s: ignore updated:" +msgstr "Barra \"%s\" excluída" + #, c-format msgid "%s: ignore added:" msgstr "" @@ -9226,7 +9230,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "ignorar apelidos/hosts de servidores ou canais" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" msgid "raw[list]: list all ignores" @@ -9235,6 +9243,9 @@ msgstr "" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/ru.po b/po/ru.po index 671afcbbb..f79339e98 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -8070,6 +8070,10 @@ msgstr "%s игнорирования не найдены\n" msgid "%s%s: ignore already exists" msgstr "%s игнорирование уже существует\n" +#, fuzzy, c-format +msgid "%s: ignore updated:" +msgstr "Игнорирования не заданы.\n" + #, fuzzy, c-format msgid "%s: ignore added:" msgstr "Игнорирования не заданы.\n" @@ -8855,7 +8859,9 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "" #, fuzzy @@ -8865,6 +8871,9 @@ msgstr "порт IRC сервера" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/sr.po b/po/sr.po index 2ab770a08..24687c77c 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-05-07 14:00+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -9157,6 +9157,11 @@ msgstr "%s: нема игнорисаних у листи" msgid "%s%s: ignore already exists" msgstr "%s%s: игнорисање већ постоји" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: додато је игнорисање:" + #, c-format msgid "%s: ignore added:" msgstr "%s: додато је игнорисање:" @@ -9911,7 +9916,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "игнорисање надимака/хостова са севера или канала" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:]<надимак> [<сервер> [<канал>]] || del <број>|-all" msgid "raw[list]: list all ignores" @@ -9920,6 +9929,11 @@ msgstr "raw[list]: испис свих игнорисања" msgid "raw[add]: add an ignore" msgstr "raw[add]: додавање игнорисања" +#, fuzzy +#| msgid "raw[addreplace]: add or replace an existing trigger" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "raw[addreplace]: додавање или замена постојећег окидача" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/tr.po b/po/tr.po index aeafabe48..7a3f04564 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2024-04-07 14:50+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -8952,6 +8952,11 @@ msgstr "%s: Listede yok sayma yok" msgid "%s%s: ignore already exists" msgstr "%s%s: Yok sayma halihazırda mevcut" +#, fuzzy, c-format +#| msgid "%s: ignore added:" +msgid "%s: ignore updated:" +msgstr "%s: Yok sayma eklendi:" + #, c-format msgid "%s: ignore added:" msgstr "%s: Yok sayma eklendi:" @@ -9813,7 +9818,11 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "kanallardan veya sunuculardan takma adları/makineleri yok say" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +#, fuzzy +#| msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "list || add [re:] [ []] || del |-all" #, fuzzy @@ -9824,6 +9833,9 @@ msgstr "IRC yok sayımlarının listesi" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/po/weechat.pot b/po/weechat.pot index c67327b6d..2e2e7cc73 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-06-09 14:41+0200\n" +"POT-Creation-Date: 2024-06-09 15:30+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -7502,6 +7502,10 @@ msgstr "" msgid "%s%s: ignore already exists" msgstr "" +#, c-format +msgid "%s: ignore updated:" +msgstr "" + #, c-format msgid "%s: ignore added:" msgstr "" @@ -8179,7 +8183,9 @@ msgid "ignore nicks/hosts from servers or channels" msgstr "" #. TRANSLATORS: only text between angle brackets (eg: "") must be translated -msgid "list || add [re:] [ []] || del |-all" +msgid "" +"list || add|addreplace [re:] [ []] || del |-" +"all" msgstr "" msgid "raw[list]: list all ignores" @@ -8188,6 +8194,9 @@ msgstr "" msgid "raw[add]: add an ignore" msgstr "" +msgid "raw[addreplace]: add or replace an existing ignore" +msgstr "" + msgid "" "nick: nick or hostname; can be a POSIX extended regular expression if \"re:" "\" is given or a mask using \"*\" to replace zero or more chars (the regular " diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 0471c0542..e19ea02f9 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -2636,7 +2636,7 @@ IRC_COMMAND_CALLBACK(ignore) { struct t_irc_ignore *ptr_ignore; char *mask, *regex, *regex2, *ptr_regex, *pos, *server, *channel, *error; - int length; + int length, update; long number; /* make C compiler happy */ @@ -2665,10 +2665,12 @@ IRC_COMMAND_CALLBACK(ignore) } /* add ignore */ - if (weechat_strcmp (argv[1], "add") == 0) + if ((weechat_strcmp (argv[1], "add") == 0) + || (weechat_strcmp (argv[1], "addreplace") == 0)) { WEECHAT_COMMAND_MIN_ARGS(3, argv[1]); + update = 0; mask = argv[2]; server = (argc > 3) ? argv[3] : NULL; channel = (argc > 4) ? argv[4] : NULL; @@ -2719,14 +2721,23 @@ IRC_COMMAND_CALLBACK(ignore) } } - if (irc_ignore_search (ptr_regex, server, channel)) + ptr_ignore = irc_ignore_search (ptr_regex, server, channel); + if (ptr_ignore) { - free (regex); - free (regex2); - weechat_printf (NULL, - _("%s%s: ignore already exists"), - weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + if (weechat_strcmp (argv[1], "addreplace") == 0) + { + update = 1; + irc_ignore_free (ptr_ignore); + } + else + { + free (regex); + free (regex2); + weechat_printf (NULL, + _("%s%s: ignore already exists"), + weechat_prefix ("error"), IRC_PLUGIN_NAME); + return WEECHAT_RC_OK; + } } ptr_ignore = irc_ignore_new (ptr_regex, server, channel); @@ -2737,7 +2748,10 @@ IRC_COMMAND_CALLBACK(ignore) if (ptr_ignore) { weechat_printf (NULL, ""); - weechat_printf (NULL, _("%s: ignore added:"), IRC_PLUGIN_NAME); + weechat_printf ( + NULL, + (update) ? _("%s: ignore updated:") : _("%s: ignore added:"), + IRC_PLUGIN_NAME); irc_command_ignore_display (ptr_ignore); } else @@ -7325,11 +7339,12 @@ irc_command_init () N_("ignore nicks/hosts from servers or channels"), /* TRANSLATORS: only text between angle brackets (eg: "") must be translated */ N_("list" - " || add [re:] [ []]" + " || add|addreplace [re:] [ []]" " || del |-all"), WEECHAT_CMD_ARGS_DESC( N_("raw[list]: list all ignores"), N_("raw[add]: add an ignore"), + N_("raw[addreplace]: add or replace an existing ignore"), N_("nick: nick or hostname; can be a POSIX extended regular expression " "if \"re:\" is given or a mask using \"*\" to replace zero or more " "chars (the regular expression can start with \"(?-i)\" to become " @@ -7349,7 +7364,8 @@ irc_command_init () AI(" /ignore add toto@domain.com libera"), AI(" /ignore add toto*@*.domain.com libera #weechat")), "list" - " || add %(irc_channel_nicks_hosts) %(irc_servers) %(irc_channels) %-" + " || add|addreplace %(irc_channel_nicks_hosts) %(irc_servers) " + "%(irc_channels) %-" " || del %(irc_ignores_numbers)|-all %-", &irc_command_ignore, NULL, NULL); weechat_hook_command (