From fd0f5f5767fba191dd087ab392643c12f79026c4 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 7 Mar 2011 12:23:32 +0100 Subject: Add new option irc.look.smart_filter_nick --- ChangeLog | 3 ++- doc/de/autogen/user/irc_options.txt | 7 ++++++- doc/en/autogen/user/irc_options.txt | 7 ++++++- doc/fr/autogen/user/irc_options.txt | 7 ++++++- doc/it/autogen/user/irc_options.txt | 7 ++++++- po/cs.po | 21 ++++++++++++++------- po/de.po | 21 ++++++++++++++------- po/es.po | 21 ++++++++++++++------- po/fr.po | 23 ++++++++++++++--------- po/hu.po | 21 ++++++++++++++------- po/it.po | 21 ++++++++++++++------- po/pl.po | 21 ++++++++++++++------- po/pt_BR.po | 16 +++++++++------- po/ru.po | 21 ++++++++++++++------- po/weechat.pot | 16 +++++++++------- src/plugins/irc/irc-config.c | 13 +++++++++++-- src/plugins/irc/irc-config.h | 1 + src/plugins/irc/irc-protocol.c | 11 ++++++++++- 18 files changed, 178 insertions(+), 80 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b0ad10cf..3d4416caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.5-dev, 2011-03-06 +v0.3.5-dev, 2011-03-07 Version 0.3.5 (under dev!) @@ -31,6 +31,7 @@ Version 0.3.5 (under dev!) * core: dynamically allocate color pairs (extended colors can be used without being added with command "/color") * core: allow background for nick colors (using ":") +* irc: add new option irc.look.smart_filter_nick * irc: ignore join if nick is not self nick and if channel buffer does not exist (bug #32667) * irc: fix crash when setting wrong value in option diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 6d00f45db..8f96b8752 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -254,7 +254,7 @@ ** Werte: merge_with_core, merge_without_core, independent (Standardwert: `merge_with_core`) * *irc.look.smart_filter* -** Beschreibung: `Filtert join/part/quit Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter im tag "irc_smart_filter" erstellt werden.` +** Beschreibung: `filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter")` ** Typ: boolesch ** Werte: on, off (Standardwert: `on`) @@ -268,6 +268,11 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `on`) +* *irc.look.smart_filter_nick* +** Beschreibung: `enable smart filter for "nick" messages` +** Typ: boolesch +** Werte: on, off (Standardwert: `on`) + * *irc.look.smart_filter_quit* ** Beschreibung: `aktiviert einen Filter für "part" und "quit" Nachrichten` ** Typ: boolesch diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 8cccb4ec6..4dd46a011 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -254,7 +254,7 @@ ** values: merge_with_core, merge_without_core, independent (default value: `merge_with_core`) * *irc.look.smart_filter* -** description: `filter join/part/quit messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter")` +** description: `filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter")` ** type: boolean ** values: on, off (default value: `on`) @@ -268,6 +268,11 @@ ** type: boolean ** values: on, off (default value: `on`) +* *irc.look.smart_filter_nick* +** description: `enable smart filter for "nick" messages` +** type: boolean +** values: on, off (default value: `on`) + * *irc.look.smart_filter_quit* ** description: `enable smart filter for "part" and "quit" messages` ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 51f125e74..21f74531e 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -254,7 +254,7 @@ ** valeurs: merge_with_core, merge_without_core, independent (valeur par défaut: `merge_with_core`) * *irc.look.smart_filter* -** description: `filtrer les messages join/part/quit pour un pseudo s'il n'a pas parlé pendant quelques minutes sur le canal (vous devez créer un filtre sur le tag "irc_smart_filter")` +** description: `filtrer les messages join/part/quit/nick pour un pseudo s'il n'a pas parlé pendant quelques minutes sur le canal (vous devez créer un filtre sur le tag "irc_smart_filter")` ** type: booléen ** valeurs: on, off (valeur par défaut: `on`) @@ -268,6 +268,11 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `on`) +* *irc.look.smart_filter_nick* +** description: `activer le filtre intelligent pour les messages "nick"` +** type: booléen +** valeurs: on, off (valeur par défaut: `on`) + * *irc.look.smart_filter_quit* ** description: `activer le filtre intelligent pour les messages "part" et "quit"` ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index fb49b6db7..28979f7fc 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -254,7 +254,7 @@ ** valori: merge_with_core, merge_without_core, independent (valore predefinito: `merge_with_core`) * *irc.look.smart_filter* -** descrizione: `filtra i messaggi di entrata/uscita/abbandono per un nick se inattivo per alcuni minuti sul canale (è necessario creare un filtro sul tag "irc_smart_filter")` +** descrizione: `filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter")` ** tipo: bool ** valori: on, off (valore predefinito: `on`) @@ -268,6 +268,11 @@ ** tipo: bool ** valori: on, off (valore predefinito: `on`) +* *irc.look.smart_filter_nick* +** descrizione: `enable smart filter for "nick" messages` +** tipo: bool +** valori: on, off (valore predefinito: `on`) + * *irc.look.smart_filter_quit* ** descrizione: `abilita filtro smart per i messaggi "part" (uscita) e "quit (disconnessione)` ** tipo: bool diff --git a/po/cs.po b/po/cs.po index 181ba0b07..40a46bb9e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -5070,9 +5070,10 @@ msgstr "" "počet čistých IRC zpráv uložených v paměti při zavření bufferu s čistými " "daty (zprávy budou zobrazeny při otevření bufferu s čistými daty)" +#, fuzzy msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" "filtrovat join/part/quit zprávy pro přezdívky pokud po nějaký čas nemluví na " "kanále (musíte vytvořit filter na tag \"irc_smart_filter\")" @@ -5080,12 +5081,19 @@ msgstr "" msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "zpoždění pro filtrování zpráv join/part/quit (v minutách)" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "povolit chytrý filter pro \"join\" zprávy" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "povolit chytrý filter pro \"part\" a \"quit\" zprávy" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "povolit chytrý filter pro \"join\" zprávy" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" "ořezávat barvy z tématu rozhovoru (použito pouze při zobrazování titulku " @@ -5463,10 +5471,6 @@ msgstr "%s%s: nemohu vytvořit nový kanál \"%s\"" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s%s%s%s%s%s%s%s%s se připojil %s%s%s" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s%s: kanál \"%s\" nebyl nalezen příkazem \"%s\"" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s%s byl vykopnut %s%s%s %s(%s%s%s)" @@ -7439,6 +7443,9 @@ msgstr "" msgid "Pointer" msgstr "Ukazatel" +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s%s: kanál \"%s\" nebyl nalezen příkazem \"%s\"" + #~ msgid "hook type: command, timer, .. (optional)" #~ msgstr "typ napojení: příkaz, časovač, .. (volitelné)" diff --git a/po/de.po b/po/de.po index 066ba90e2..04786dfa5 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-24 19:23+0100\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev \n" @@ -5293,9 +5293,10 @@ msgstr "" "der RAW-Daten-Buffer geschlossen ist (die Nachrichten werden umgehend " "angezeigt sobald der RAW-Daten-Buffer geöffnet wird)" +#, fuzzy msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" "Filtert join/part/quit Nachrichten für einen Nick der einige Minuten im " "Channel inaktiv gewesen ist. Dazu muss ein Filter im tag \"irc_smart_filter" @@ -5305,12 +5306,19 @@ msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" "Verzögerung, in Minuten, in denen join/part/quit Nachrichten gefiltert werden" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "aktiviert einen Filter für \"join\" Nachrichten" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "aktiviert einen Filter für \"part\" und \"quit\" Nachrichten" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "aktiviert einen Filter für \"join\" Nachrichten" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" "Farben werden im Topic gestrippt (wird nur genutzt wenn der Buffer-Titel " @@ -5702,10 +5710,6 @@ msgstr "%s%s: Konnte den neuen Channel \"%s\" nicht erzeugen" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s%s%s%s%s%s%s%s%s ist in den Channel %s%s%s gekommen" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s%s: Channel \"%s\" für den \"%s\"-Befehl nicht gefunden" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s%s hat %s%s%s gekickt %s(%s%s%s)" @@ -7754,6 +7758,9 @@ msgstr "Hashtable (Ausgabe)" msgid "Pointer" msgstr "Pointer" +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s%s: Channel \"%s\" für den \"%s\"-Befehl nicht gefunden" + #~ msgid "hook type: command, timer, .. (optional)" #~ msgstr "hook Type: command, timer, .. (optional)" diff --git a/po/es.po b/po/es.po index ef1d48025..551c8e741 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5197,9 +5197,10 @@ msgstr "" "número de mensajes brutos a mantener en memoria cuando el buffer de datos en " "bruto está cerrado (los mensajes serán mostrados cuando sea abra este buffer)" +#, fuzzy msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" "filtrar mensajes de unión/abandono/salida para apodos que no hayan hablado " "en los últimos minutos en el canal (debes crear un filtro para la etiqueta " @@ -5209,12 +5210,19 @@ msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" "tiempo de espera para filtrar mensajes de unión/abandono/salida (en minutos)" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "habilitar el filtro inteligente para mensajes de unión" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "habilitar el filtro inteligente para mensajes de abandono y salida" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "habilitar el filtro inteligente para mensajes de unión" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" "remover colores en el tema (usado solamente cuando se esté mostrando el " @@ -5591,10 +5599,6 @@ msgstr "%s%s: no es posible crear el nuevo canal \"%s\"" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s%s%s%s%s%s%s%s%s se ha unido a %s%s%s" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s%s: canal \"%s\" no encontrado para el comando \"%s\"" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s%s ha expulsado %s%s%s %s(%s%s%s)" @@ -7621,6 +7625,9 @@ msgstr "Tabla hash (salida)" msgid "Pointer" msgstr "Puntero" +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s%s: canal \"%s\" no encontrado para el comando \"%s\"" + #~ msgid "hook type: command, timer, .. (optional)" #~ msgstr "tipo de enganche: comando, temporizador, .. (opcional)" diff --git a/po/fr.po b/po/fr.po index acaad4ad3..8d201340d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" -"PO-Revision-Date: 2011-03-04 14:05+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" +"PO-Revision-Date: 2011-03-07 11:40+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -5198,22 +5198,28 @@ msgstr "" "du tampon des données brutes)" msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" -"filtrer les messages join/part/quit pour un pseudo s'il n'a pas parlé " +"filtrer les messages join/part/quit/nick pour un pseudo s'il n'a pas parlé " "pendant quelques minutes sur le canal (vous devez créer un filtre sur le tag " "\"irc_smart_filter\")" msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "délai pour filtrer les messages join/part/quit (en minutes)" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "activer le filtre intelligent pour les messages \"join\"" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "activer le filtre intelligent pour les messages \"part\" et \"quit\"" +#. TRANSLATORS: please do not translate "nick" +msgid "enable smart filter for \"nick\" messages" +msgstr "activer le filtre intelligent pour les messages \"nick\"" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" "supprimer les couleurs dans le titre (utilisé seulement lors de l'affichage " @@ -5590,10 +5596,6 @@ msgstr "%s%s: impossible de créer le nouveau canal \"%s\"" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s%s%s%s%s%s%s%s%s a rejoint %s%s%s" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s%s: canal \"%s\" non trouvé pour la commande \"%s\"" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s%s a expulsé %s%s%s %s(%s%s%s)" @@ -7620,5 +7622,8 @@ msgstr "Hashtable (sortie)" msgid "Pointer" msgstr "Pointeur" +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s%s: canal \"%s\" non trouvé pour la commande \"%s\"" + #~ msgid "hook type: command, timer, .. (optional)" #~ msgstr "type de hook: command, timer, .. (optionnel)" diff --git a/po/hu.po b/po/hu.po index 85dcb72d8..90f33eced 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4741,20 +4741,27 @@ msgid "" msgstr "" msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" +#. TRANSLATORS: please do not translate "join" #, fuzzy msgid "enable smart filter for \"join\" messages" msgstr "új üzenetet tartalmazó ablak színe" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "új üzenetet tartalmazó ablak színe" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" @@ -5139,10 +5146,6 @@ msgstr "%s nem sikerült új szobát nyitni \"%s\"\n" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s %s(%s%s%s)%s belépett a(z) %s%s szobába\n" -#, fuzzy, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n" - #, fuzzy, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából" @@ -7082,6 +7085,10 @@ msgstr "" msgid "Pointer" msgstr "perc" +#, fuzzy +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n" + #, fuzzy #~ msgid "a color name" #~ msgstr "gépnevek színe" diff --git a/po/it.po b/po/it.po index 373882b01..d36a9f736 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-22 19:26+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -5115,9 +5115,10 @@ msgstr "" "viene chiuso (i messaggi verranno visualizzati all'apertura del buffer dei " "dati raw)" +#, fuzzy msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" "filtra i messaggi di entrata/uscita/abbandono per un nick se inattivo per " "alcuni minuti sul canale (è necessario creare un filtro sul tag " @@ -5128,14 +5129,21 @@ msgstr "" "ritardo per il filtraggio dei messaggi di entrata/uscita/abbandono (in " "minuti)" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "abilita filtro smart per i messaggi \"join\" (entrata)" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" "abilita filtro smart per i messaggi \"part\" (uscita) e \"quit " "(disconnessione)" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "abilita filtro smart per i messaggi \"join\" (entrata)" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" "elimina colori nell'argomento (utilizzato solo quando viene visualizzato il " @@ -5515,10 +5523,6 @@ msgstr "%s%s: impossibile creare il nuovo canale \"%s\"" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s%s%s%s%s%s%s%s%s è entrato in %s%s%s" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s%s: canale \"%s\" non trovato per il comando \"%s\"" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s%s ha cacciato %s%s%s %s(%s%s%s)" @@ -7524,6 +7528,9 @@ msgstr "Tabella hash (output)" msgid "Pointer" msgstr "Puntatore" +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s%s: canale \"%s\" non trovato per il comando \"%s\"" + #~ msgid "hook type: command, timer, .. (optional)" #~ msgstr "tipo hook: comando, timer, ... (opzionale)" diff --git a/po/pl.po b/po/pl.po index 841510aa4..089d00dd2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -5176,9 +5176,10 @@ msgstr "" "jest bufornieprzetworzonych danych (wiadomości zostaną wyświetlone po " "otworzeniu dla nich bufora)" +#, fuzzy msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" "filtruj wiadomości wejścia/opuszczenia/wyjścia od nicków nie będących " "aktywnymi od kilku minut na kanale (musisz stworzyć filtr na tagu " @@ -5188,12 +5189,19 @@ msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" "odstęp dla filtrowania wiadomości wejścia/opuszczenia/wyjścia (w minutach)" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "włącza mądre filtrowanie dla wiadomości \"join\"" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "włącza inteligentne filtrowanie dla wiadomości \"part\" oraz \"quit\"" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "włącza mądre filtrowanie dla wiadomości \"join\"" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "usuń kolory w tematach (używane przy wuświetlaniu tytyłu bufora)" @@ -5564,10 +5572,6 @@ msgstr "%s%s: nie można utworzyć nowego kanału \"%s\"" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s%s%s%s%s%s%s%s%s wszedł na %s%s%s" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s%s: nie znaleziono kanału \"%s\" dla komendy \"%s\" " - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s%s wykopał %s%s%s %s(%s%s%s)" @@ -7543,6 +7547,9 @@ msgstr "Hashtable (wyjście)" msgid "Pointer" msgstr "Wskaźnik" +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s%s: nie znaleziono kanału \"%s\" dla komendy \"%s\" " + #~ msgid "hook type: command, timer, .. (optional)" #~ msgstr "typ uchwytu: komenda, timer, .. (opcjonalne)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 24ab81a87..5d46d0ea0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-07 17:30+0100\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -4572,19 +4572,25 @@ msgid "" msgstr "" msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "nick" +msgid "enable smart filter for \"nick\" messages" +msgstr "" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" @@ -4927,10 +4933,6 @@ msgstr "" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "" diff --git a/po/ru.po b/po/ru.po index 85b7e606c..9333582e6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: 2011-02-07 17:30+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4748,20 +4748,27 @@ msgid "" msgstr "" msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" +#. TRANSLATORS: please do not translate "join" #, fuzzy msgid "enable smart filter for \"join\" messages" msgstr "цвет текущего окна с сообщениями" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "nick" +#, fuzzy +msgid "enable smart filter for \"nick\" messages" +msgstr "цвет текущего окна с сообщениями" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" @@ -5153,10 +5160,6 @@ msgstr "%s не могу создать новый канал \"%s\"\n" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s %s(%s%s%s)%s зашёл на канал %s%s\n" -#, fuzzy, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "%s канал \"%s\" не найден для команды \"%s\"\n" - #, fuzzy, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "%s%s%s выкинул %s%s%s с канала %s%s" @@ -7091,6 +7094,10 @@ msgstr "" msgid "Pointer" msgstr "минута" +#, fuzzy +#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" +#~ msgstr "%s канал \"%s\" не найден для команды \"%s\"\n" + #, fuzzy #~ msgid "a color name" #~ msgstr "цвет hostname" diff --git a/po/weechat.pot b/po/weechat.pot index d5c94b718..3b13f9995 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"POT-Creation-Date: 2011-03-07 12:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4039,19 +4039,25 @@ msgid "" msgstr "" msgid "" -"filter join/part/quit messages for a nick if not speaking for some minutes " -"on channel (you must create a filter on tag \"irc_smart_filter\")" +"filter join/part/quit/nick messages for a nick if not speaking for some " +"minutes on channel (you must create a filter on tag \"irc_smart_filter\")" msgstr "" msgid "delay for filtering join/part/quit messages (in minutes)" msgstr "" +#. TRANSLATORS: please do not translate "join" msgid "enable smart filter for \"join\" messages" msgstr "" +#. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "nick" +msgid "enable smart filter for \"nick\" messages" +msgstr "" + msgid "strip colors in topic (used only when displaying buffer title)" msgstr "" @@ -4394,10 +4400,6 @@ msgstr "" msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "" -#, c-format -msgid "%s%s: channel \"%s\" not found for \"%s\" command" -msgstr "" - #, c-format msgid "%s%s%s%s has kicked %s%s%s %s(%s%s%s)" msgstr "" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 4c5ef2995..a7e7f3a67 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -90,6 +90,7 @@ struct t_config_option *irc_config_look_smart_filter; struct t_config_option *irc_config_look_smart_filter_delay; struct t_config_option *irc_config_look_smart_filter_join; struct t_config_option *irc_config_look_smart_filter_quit; +struct t_config_option *irc_config_look_smart_filter_nick; struct t_config_option *irc_config_look_topic_strip_colors; /* IRC config, color section */ @@ -2030,8 +2031,8 @@ irc_config_init () irc_config_look_smart_filter = weechat_config_new_option ( irc_config_file, ptr_section, "smart_filter", "boolean", - N_("filter join/part/quit messages for a nick if not speaking for " - "some minutes on channel (you must create a filter on tag " + N_("filter join/part/quit/nick messages for a nick if not speaking " + "for some minutes on channel (you must create a filter on tag " "\"irc_smart_filter\")"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_smart_filter_delay = weechat_config_new_option ( @@ -2042,13 +2043,21 @@ irc_config_init () irc_config_look_smart_filter_join = weechat_config_new_option ( irc_config_file, ptr_section, "smart_filter_join", "boolean", + /* TRANSLATORS: please do not translate "join" */ N_("enable smart filter for \"join\" messages"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_smart_filter_quit = weechat_config_new_option ( irc_config_file, ptr_section, "smart_filter_quit", "boolean", + /* TRANSLATORS: please do not translate "part" and "quit" */ N_("enable smart filter for \"part\" and \"quit\" messages"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_smart_filter_nick = weechat_config_new_option ( + irc_config_file, ptr_section, + "smart_filter_nick", "boolean", + /* TRANSLATORS: please do not translate "nick" */ + N_("enable smart filter for \"nick\" messages"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_topic_strip_colors = weechat_config_new_option ( irc_config_file, ptr_section, "topic_strip_colors", "boolean", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 2902af8ee..d843cf94f 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -115,6 +115,7 @@ extern struct t_config_option *irc_config_look_smart_filter; extern struct t_config_option *irc_config_look_smart_filter_delay; extern struct t_config_option *irc_config_look_smart_filter_join; extern struct t_config_option *irc_config_look_smart_filter_quit; +extern struct t_config_option *irc_config_look_smart_filter_nick; extern struct t_config_option *irc_config_look_topic_strip_colors; extern struct t_config_option *irc_config_color_message_join; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index fd518207c..741d30cf6 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -809,6 +809,7 @@ IRC_PROTOCOL_CALLBACK(nick) struct t_irc_nick *ptr_nick, *ptr_nick_found; char *new_nick, *old_color, *buffer_name; int local_nick; + struct t_irc_channel_speaking *ptr_nick_speaking; /* * NICK message looks like: @@ -877,8 +878,16 @@ IRC_PROTOCOL_CALLBACK(nick) if (!irc_ignore_check (server, ptr_channel->name, nick, host)) { + ptr_nick_speaking = ((weechat_config_boolean (irc_config_look_smart_filter)) + && (weechat_config_boolean (irc_config_look_smart_filter_nick))) ? + irc_channel_nick_speaking_time_search (ptr_channel, nick, 1) : NULL; weechat_printf_tags (ptr_channel->buffer, - irc_protocol_tags (command, NULL, NULL), + irc_protocol_tags (command, + (!weechat_config_boolean (irc_config_look_smart_filter) + || !weechat_config_boolean (irc_config_look_smart_filter_nick) + || ptr_nick_speaking) ? + NULL : "irc_smart_filter", + NULL), _("%s%s%s%s is now known as " "%s%s%s"), weechat_prefix ("network"), -- cgit v1.2.3