diff options
| -rw-r--r-- | ChangeLog.adoc | 2 | ||||
| -rw-r--r-- | po/cs.po | 12 | ||||
| -rw-r--r-- | po/de.po | 12 | ||||
| -rw-r--r-- | po/es.po | 12 | ||||
| -rw-r--r-- | po/fr.po | 11 | ||||
| -rw-r--r-- | po/hu.po | 10 | ||||
| -rw-r--r-- | po/it.po | 12 | ||||
| -rw-r--r-- | po/ja.po | 12 | ||||
| -rw-r--r-- | po/pl.po | 12 | ||||
| -rw-r--r-- | po/pt.po | 12 | ||||
| -rw-r--r-- | po/pt_BR.po | 12 | ||||
| -rw-r--r-- | po/ru.po | 10 | ||||
| -rw-r--r-- | po/sr.po | 12 | ||||
| -rw-r--r-- | po/tr.po | 12 | ||||
| -rw-r--r-- | po/weechat.pot | 7 | ||||
| -rw-r--r-- | src/core/wee-command.c | 29 |
16 files changed, 77 insertions, 112 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 65545648b..cf7838779 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -34,7 +34,7 @@ New features:: * core: rename option weechat.color.status_name_ssl to weechat.color.status_name_tls * core, plugins: make many identifiers case sensitive (issue #1872, issue #398, bug #32213) * core: add item "mouse_status" in default status bar, change default color to lightgreen - * core, trigger: add options weechat.color.chat_status_disabled and weechat.color.chat_status_enabled, remove options trigger.color.trigger and trigger.color.trigger_disabled (issue #1820) + * core, trigger: add options weechat.color.chat_status_disabled and weechat.color.chat_status_enabled, remove options trigger.color.trigger and trigger.color.trigger_disabled, add enabled/disabled status color in output of `/filter list` (issue #1820) * api: add function config_set_version (issue #1238) * api: add optional argument with version in info "version_number" * alias: use lower case for default aliases, rename all aliases to lower case on upgrade (issue #1872) @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: cs\n" @@ -403,13 +403,11 @@ msgstr "chyba" msgid "%sError in expression to evaluate" msgstr "%sChyba ve výrazu k vyhodnocení" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s buffer: %s%s%s / značky: %s / regulární výraz: %s %s" -msgid "(disabled)" -msgstr "(vypnuto)" - msgid "Message filtering enabled" msgstr "Filtrování zpráv povoleno" @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German - Germany <weechatter@arcor.de>\n" "Language: de_DE\n" @@ -445,13 +445,11 @@ msgstr "Fehler" msgid "%sError in expression to evaluate" msgstr "%sFehler im Ausdruck, der verarbeitet werden soll" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s Buffer: %s%s%s / Schlagwörter: %s / regex: %s %s" -msgid "(disabled)" -msgstr "(deaktiviert)" - msgid "Message filtering enabled" msgstr "Filterung von Nachrichten ist aktiviert" @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Santiago Forero <santiago@forero.xyz>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: es\n" @@ -456,13 +456,11 @@ msgstr "error" msgid "%sError in expression to evaluate" msgstr "%sError en la expresión a evaluar" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s buffer: %s%s%s / etiquetas: %s / expresión: %s %s" -msgid "(disabled)" -msgstr "(desactivado)" - msgid "Message filtering enabled" msgstr "Filtro de mensajes activado" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -429,11 +429,8 @@ msgid "%sError in expression to evaluate" msgstr "%sErreur dans l'expression à évaluer" #, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" -msgstr " %s[%s%s%s]%s tampon : %s%s%s / étiquettes : %s / regex : %s %s" - -msgid "(disabled)" -msgstr "(désactivé)" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" +msgstr " %s%s%s : tampon : %s%s%s / étiquettes : %s / regex : %s" msgid "Message filtering enabled" msgstr "Filtrage de messages activé" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: hu\n" @@ -376,14 +376,10 @@ msgid "%sError in expression to evaluate" msgstr "" #, fuzzy, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " (nincs üzenetkezelő)\n" #, fuzzy -msgid "(disabled)" -msgstr "a felhasználók le lettek tiltva" - -#, fuzzy msgid "Message filtering enabled" msgstr "Nincs aliasz definiálva.\n" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: it\n" @@ -376,13 +376,11 @@ msgstr "errore" msgid "%sError in expression to evaluate" msgstr "%sErrore nell'espressione da analizzare" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s buffer: %s%s%s / tag: %s /regex: %s %s" -msgid "(disabled)" -msgstr "(disabilitato)" - msgid "Message filtering enabled" msgstr "Filtraggio dei messaggi abilitato" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" "translation/ja_JP>\n" @@ -421,13 +421,11 @@ msgstr "エラー" msgid "%sError in expression to evaluate" msgstr "%s評価する式にエラーがあります" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s バッファ: %s%s%s / タグ: %s / 正規表現: %s %s" -msgid "(disabled)" -msgstr "(無効)" - msgid "Message filtering enabled" msgstr "メッセージフィルタが有効" @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" "Language: pl\n" @@ -455,13 +455,11 @@ msgstr "błąd" msgid "%sError in expression to evaluate" msgstr "%sBłąd w wyrażeniu do przetworzenia" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s bufor: %s%s%s / tagi: %s / wyrażenie: %s %s" -msgid "(disabled)" -msgstr "(wyłączone)" - msgid "Message filtering enabled" msgstr "Filtrowanie wiadomości włączone" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" "Language: pt\n" @@ -404,13 +404,11 @@ msgstr "erro" msgid "%sError in expression to evaluate" msgstr "%sErro na expressão a avaliar" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" -msgid "(disabled)" -msgstr "(desativado)" - msgid "Message filtering enabled" msgstr "Filtragem de mensagens ativada" diff --git a/po/pt_BR.po b/po/pt_BR.po index a7d0b5799..ea372b74f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: pt_BR\n" @@ -411,14 +411,12 @@ msgstr "" msgid "%sError in expression to evaluate" msgstr "" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr "" " %s[%s%s%s]%s buffer: %s%s%s / marcadores: %s / expressão regular: %s %s" -msgid "(disabled)" -msgstr "(desabilitado)" - msgid "Message filtering enabled" msgstr "Filtro de mensagem habilitado" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: ru\n" @@ -381,14 +381,10 @@ msgid "%sError in expression to evaluate" msgstr "" #, fuzzy, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " (нет обработчика сообщений)\n" #, fuzzy -msgid "(disabled)" -msgstr "команда users отключена" - -#, fuzzy msgid "Message filtering enabled" msgstr "Сокращения не заданы.\n" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: sr\n" @@ -453,13 +453,11 @@ msgstr "грешка" msgid "%sError in expression to evaluate" msgstr "%sГрешка у изразу који треба да се израчуна" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr " %s[%s%s%s]%s бафер: %s%s%s / ознака: %s / регуларни израз: %s %s" -msgid "(disabled)" -msgstr "(искључено)" - msgid "Message filtering enabled" msgstr "Укључено филтритрање порука" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-05-01 20:13+0200\n" -"PO-Revision-Date: 2023-05-01 20:15+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" +"PO-Revision-Date: 2023-05-01 20:23+0200\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: tr\n" @@ -444,14 +444,12 @@ msgstr "hata" msgid "%sError in expression to evaluate" msgstr "%sDeğerlendirilecek ifadede hata" -#, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +#, fuzzy, c-format +#| msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr "" " %s[%s%s%s]%s arabellek: %s%s%s / etiketler: %s / düzenli ifade: %s %s" -msgid "(disabled)" -msgstr "(devre dışı)" - msgid "Message filtering enabled" msgstr "İleti süzme etkin" diff --git a/po/weechat.pot b/po/weechat.pot index b248ac862..9bc5b924b 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: 2023-05-01 20:13+0200\n" +"POT-Creation-Date: 2023-05-01 20:20+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -354,10 +354,7 @@ msgid "%sError in expression to evaluate" msgstr "" #, c-format -msgid " %s[%s%s%s]%s buffer: %s%s%s / tags: %s / regex: %s %s" -msgstr "" - -msgid "(disabled)" +msgid " %s%s%s: buffer: %s%s%s / tags: %s / regex: %s" msgstr "" msgid "Message filtering enabled" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 8d753774c..9a9644cac 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -2382,21 +2382,20 @@ COMMAND_CALLBACK(eval) void command_filter_display (struct t_gui_filter *filter) { - gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER, - _(" %s[%s%s%s]%s buffer: %s%s%s " - "/ tags: %s / regex: %s %s"), - GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), - GUI_COLOR(GUI_COLOR_CHAT), - filter->name, - GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), - GUI_COLOR(GUI_COLOR_CHAT), - GUI_COLOR(GUI_COLOR_CHAT_BUFFER), - filter->buffer_name, - GUI_COLOR(GUI_COLOR_CHAT), - filter->tags, - filter->regex, - (filter->enabled) ? - "" : _("(disabled)")); + gui_chat_printf_date_tags ( + NULL, 0, GUI_FILTER_TAG_NO_FILTER, + _(" %s%s%s: buffer: %s%s%s " + "/ tags: %s / regex: %s"), + GUI_COLOR( + (filter->enabled) ? + GUI_COLOR_CHAT_STATUS_ENABLED : GUI_COLOR_CHAT_STATUS_DISABLED), + filter->name, + GUI_COLOR(GUI_COLOR_CHAT), + GUI_COLOR(GUI_COLOR_CHAT_BUFFER), + filter->buffer_name, + GUI_COLOR(GUI_COLOR_CHAT), + filter->tags, + filter->regex); } /* |