diff options
33 files changed, 881 insertions, 227 deletions
@@ -1,12 +1,17 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.5-dev, 2011-04-10 +v0.3.5-dev, 2011-04-11 Version 0.3.5 (under dev!) -------------------------- +* core: add option weechat.look.hotlist_buffer_separator +* core: add messages counts in hotlist for each buffer, new options: + weechat.look.hotlist_count_max, weechat.look.hotlist_count_min_msg and + weechat.color.status_count_{msg|private|highlight|other} +* core: add tag "notify_none" (line with this tag will not update hotlist) * core: add optional bar name in command /bar default * core: create default bars only if no bar is defined in configuration file * core: add new option weechat.look.highlight_tags (force highlight on tags) diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index bd0ce4245..8596b6f90 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -166,50 +166,50 @@ windows: zeigt die Fensterstruktur an add <name> <buffer>[,<buffer>...] <tags> <regex> del <name>|-all - list: alle Filter auflisten - enable: Filter wird aktiviert (Filter werden standardmässig aktiviert) -disable: Filter deaktivieren - toggle: Filter de-/aktivieren - name: Name des Filters - add: Filter hinzufügen - del: Filter entfernen - -all: entfernt alle Filter - buffer: durch Kommata getrennte Liste von Buffern in denen der Filter aktiv sein soll: - - ist der vollständige Name eines Buffers inklusive seiner Erweiterung (Beispiel: "irc.freenode.#weechat") - - "*" bedeutet alle Buffer - - beginnt ein Name mit '!' wird für diesen Buffer kein Filter genutzt - - ein Name darf mit '*' beginnen oder enden um mehrere Buffer auszuwählen - tags: durch Kommata getrennte Liste mit Tags. Zum Beispiel: "irc_join,irc_part,irc_quit" - regex: regulärer Ausdruck um in einer Zeile zu suchen - - das Präfix (z.B. Nick) wird mittels '\t' von der Nachricht getrennt. Sonderzeichen wie '|' müssen mit einer Escapesequenz : '\|' eingebunden werden) - - wird ein regulärer Ausdruck mit '!' eingeleitet dann wird das übereinstimmende Ergebnis umgekehrt (nutze '\!' um mit '!' zu beginnen) - - es werden zwei reguläre Ausdrücke erstellt: Der erste für den Präfix und der zweite für die eigentliche Nachricht - -Die Tastenvoreinstellung alt+'=' schaltet die Filterfunktion an/aus. - -Die am häufigsten gebrauchten Tags lauten: - no_filter, no_highlight, no_log, log0..log9 (log Level), - notify_message, notify_private, notify_highlight, - nick_xxx (xxx ist durch den Nicknamen zu ersetzen), - irc_xxx (xxx ist durch einen IRC Befehl oder die IRC Nummer zu ersetzen, siehe /server raw) + list: list all filters + enable: enable filters (filters are enabled by default) +disable: disable filters + toggle: toggle filters + name: filter name + add: add a filter + del: delete a filter + -all: delete all filters + buffer: comma separated list of buffers where filter is active: + - this is full name including plugin (example: "irc.freenode.#weechat") + - "*" means all buffers + - a name starting with '!' is excluded + - name can start or end with '*' to match many buffers + tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit" + regex: regular expression to search in line + - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|' + - if regex starts with '!', then matching result is reversed (use '\!' to start with '!') + - two regular expressions are created: one for prefix and one for message + +The default key alt+'=' toggles filtering on/off. + +Tags most commonly used: + no_filter, no_highlight, no_log, log0..log9 (log level), + notify_none, notify_message, notify_private, notify_highlight, + nick_xxx (xxx is nick in message), + irc_xxx (xxx is command name or number, see /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. -Beispiele: - aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten für alle Buffer: +Examples: + use IRC smart filter on all buffers: /filter add irc_smart * irc_smart_filter * - aktiviert einen einfachen IRC Filter für join/part/quit/nick Nachrichten der für alle Buffer genutzt wird, außer Buffer die "#weechat" im Namen tragen: + use IRC smart filter on all buffers except those with "#weechat" in name: /filter add irc_smart *,!*#weechat* irc_smart_filter * - filtert alle IRC join/part/quit Nachrichten: + filter all IRC join/part/quit messages: /filter add joinquit * irc_join,irc_part,irc_quit * - filtert Nicks wenn diese den Channel betreten oder durch den Befehl "/names:" angezeigt werden: + filter nicks displayed when joining channels or with /names: /filter add nicks * irc_366 * - filtert Nick "toto" im IRC Channel #weechat: + filter nick "toto" on IRC channel #weechat: /filter add toto irc.freenode.#weechat * toto\t - nur der Nick "tutu" wird im IRC Channel #test angezeigt: - /filter add tutu irc.freenode.#test * !tutu\t - filtert Zeilen die das Wort "spam" enthalten: + keep only nick "titi" on IRC channel #test: + /filter add titi irc.freenode.#test * !titi\t + filter lines containing word "spam": /filter add filterspam * * spam - filtert Zeilen die "weechat sucks" im IRC Channel #weechat enthalten: + filter lines containing "weechat sucks" on IRC channel #weechat: /filter add sucks irc.freenode.#weechat * weechat sucks ........................................ diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index e78fafbbc..7c11e96a4 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -173,6 +173,26 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `blue`) +* *weechat.color.status_count_highlight* +** Beschreibung: `text color for count of highlight messages in hotlist (status bar)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `magenta`) + +* *weechat.color.status_count_msg* +** Beschreibung: `text color for count of messages in hotlist (status bar)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `brown`) + +* *weechat.color.status_count_other* +** Beschreibung: `text color for count of other messages in hotlist (status bar)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`) + +* *weechat.color.status_count_private* +** Beschreibung: `text color for count of private messages in hotlist (status bar)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `green`) + * *weechat.color.status_data_highlight* ** Beschreibung: `Farbe eines Buffers mit Highlight-Nachricht (Statusbar)` ** Typ: Farbe @@ -353,6 +373,21 @@ ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"-"`) +* *weechat.look.hotlist_buffer_separator* +** Beschreibung: `string displayed between buffers in hotlist` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `", "`) + +* *weechat.look.hotlist_count_max* +** Beschreibung: `max number of messages count to display in hotlist for a buffer (0 = never display messages count)` +** Typ: integer +** Werte: 0 .. 4 (Standardwert: `2`) + +* *weechat.look.hotlist_count_min_msg* +** Beschreibung: `display messages count if number of messages is greater or equal to this value` +** Typ: integer +** Werte: 1 .. 100 (Standardwert: `2`) + * *weechat.look.hotlist_names_count* ** Beschreibung: `Maximale Anzahl an Namen in der Hotlist (0 = es werden keine Namen angezeigt, sondern nur die Nummern der Buffer)` ** Typ: integer diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index d5c2b266d..d0d3a81c5 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -352,7 +352,7 @@ Beispiel des WeeChat-Terminals: │ │ │ │ │ │ │ │ │ -│[12:55] [4] [irc/freenode] 3:#test(+n){5}* [Act: 4,2] │ +│[12:55] [6] [irc/freenode] 3:#test(+n){5}* [Act: 4:#abc(2,5), 6] │ │[flashy] hi joe!█ │ └─────────────────────────────────────────────────────────────────────────────────────────┘ ........................................ @@ -373,18 +373,20 @@ Die 'status'-Bar besitzt als Standardeinträge: [width="100%",cols="^3,^3l,10",options="header"] |======================================== -| Item | Beispiel | Beschreibung -| time | [12:55] | Uhrzeit -| buffer_count | [4] | Anzahl der geöffneten Buffer -| buffer_plugin | [irc/freenode] | Erweiterung des aktuellen Buffers (IRC Erweiterung setzt den IRC Servername für den Buffer) -| buffer_number | 3 | aktuelle Nummer des Buffers -| buffer_name | #test(+n) | Name des aktuellen Buffers -| buffer_nicklist_count | {5} | Anzahl der Nicks in Nickliste -| buffer_filter | * | Filteranzeige: `*` bedeutet das Zeilen gefiltert (unterdrückt) wurden. Ein leerer Eintrag zeigt an dass alle Zeilen dargestellt werden -| lag | [Lag: 2.5] | Verzögerungsanzeige, in Sekunden (keine Anzeige falls Verzögerung gering) -| hotlist | [Act: 4,2] | Liste der Buffer mit Aktivität (ungelesene Nachrichten) -| completion | abc(2) def(5) | Liste von Wörtern für Vervollständigung, die Zahl zeigt an wie viele Varianten möglich sind -| scroll | -MORE(50)- | Scroll Indikator, zeigt an wie viele Zeilen unterhalb der zur Zeit dargestellten Zeile vorhanden sind +| Item | Beispiel | Beschreibung +| time | [12:55] | Uhrzeit +| buffer_count | [6] | Anzahl der geöffneten Buffer +| buffer_plugin | [irc/freenode] | Erweiterung des aktuellen Buffers (IRC Erweiterung setzt den IRC Servername für den Buffer) +| buffer_number | 3 | aktuelle Nummer des Buffers +// TRANSLATION MISSING +| buffer_name | #test(+n) | Name des aktuellen Buffers (with channel modes for irc channels) +| buffer_nicklist_count | {5} | Anzahl der Nicks in Nickliste +| buffer_filter | * | Filteranzeige: `*` bedeutet das Zeilen gefiltert (unterdrückt) wurden. Ein leerer Eintrag zeigt an dass alle Zeilen dargestellt werden +| lag | [Lag: 2.5] | Verzögerungsanzeige, in Sekunden (keine Anzeige falls Verzögerung gering) +// TRANSLATION MISSING +| hotlist | [Act: 4:#abc(2,5), 6] | Liste der Buffer mit Aktivität (ungelesene Nachrichten) (in example, 2 highlights and 5 unread messages on '#abc', one unread message on buffer #6) +| completion | abc(2) def(5) | Liste von Wörtern für Vervollständigung, die Zahl zeigt an wie viele Varianten möglich sind +| scroll | -MORE(50)- | Scroll Indikator, zeigt an wie viele Zeilen unterhalb der zur Zeit dargestellten Zeile vorhanden sind |======================================== In der 'input' Bar lautet die Standardeinstellung: @@ -393,10 +395,10 @@ In der 'input' Bar lautet die Standardeinstellung: |======================================== | Item | Beispiel | Beschreibung | input_paste | [Paste 7 lines ? [ctrl-Y] Ja [ctrl-N] Nein] | Nachfrage ob sieben Zeilen eingefügt werden sollen -| input_prompt | [nick] | input prompt (Nickname für den IRC) +| input_prompt | [flashy] | input prompt (Nickname für den IRC) | away | (away) | Abwesenheitsanzeige | input_search | [Text search] | Textsuche -| input_text | bla bla... | Text der eingegeben wird +| input_text | hi joe! | Text der eingegeben wird |======================================== [[key_bindings]] diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index 4545869f1..aa9941d37 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -189,7 +189,7 @@ The default key alt+'=' toggles filtering on/off. Tags most commonly used: no_filter, no_highlight, no_log, log0..log9 (log level), - notify_message, notify_private, notify_highlight, + notify_none, notify_message, notify_private, notify_highlight, nick_xxx (xxx is nick in message), irc_xxx (xxx is command name or number, see /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 225b6b937..a55a2f81d 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -149,7 +149,7 @@ ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `lightgreen`) * *weechat.color.input_text_not_found* -** description: `text color for unsucessful text search in input line` +** description: `text color for unsuccessful text search in input line` ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `red`) @@ -173,6 +173,26 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `blue`) +* *weechat.color.status_count_highlight* +** description: `text color for count of highlight messages in hotlist (status bar)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `magenta`) + +* *weechat.color.status_count_msg* +** description: `text color for count of messages in hotlist (status bar)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `brown`) + +* *weechat.color.status_count_other* +** description: `text color for count of other messages in hotlist (status bar)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `default`) + +* *weechat.color.status_count_private* +** description: `text color for count of private messages in hotlist (status bar)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `green`) + * *weechat.color.status_data_highlight* ** description: `text color for buffer with highlight (status bar)` ** type: color @@ -353,6 +373,21 @@ ** type: string ** values: any string (default value: `"-"`) +* *weechat.look.hotlist_buffer_separator* +** description: `string displayed between buffers in hotlist` +** type: string +** values: any string (default value: `", "`) + +* *weechat.look.hotlist_count_max* +** description: `max number of messages count to display in hotlist for a buffer (0 = never display messages count)` +** type: integer +** values: 0 .. 4 (default value: `2`) + +* *weechat.look.hotlist_count_min_msg* +** description: `display messages count if number of messages is greater or equal to this value` +** type: integer +** values: 1 .. 100 (default value: `2`) + * *weechat.look.hotlist_names_count* ** description: `max number of names in hotlist (0 = no name displayed, only buffer numbers)` ** type: integer diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index a4990dfcb..e914f01c4 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -354,7 +354,7 @@ Example of terminal with WeeChat: │ │ │ │ │ │ │ │ │ -│[12:55] [4] [irc/freenode] 3:#test(+n){5}* [Act: 4,2] │ +│[12:55] [6] [irc/freenode] 3:#test(+n){5}* [Act: 4:#abc(2,5), 6] │ │[flashy] hi joe!█ │ └─────────────────────────────────────────────────────────────────────────────────────────┘ ........................................ @@ -375,18 +375,18 @@ Bar 'status' has following default items: [width="100%",cols="^3,^3l,10",options="header"] |======================================== -| Item | Example | Description -| time | [12:55] | time -| buffer_count | [4] | number of opened buffers -| buffer_plugin | [irc/freenode] | plugin of current buffer (irc plugin can add IRC server name used by buffer) -| buffer_number | 3 | current buffer number -| buffer_name | #test(+n) | current buffer name -| buffer_nicklist_count | {5} | number of nicks in nicklist -| buffer_filter | * | filtering indicator: `*` means some lines are filtered (hidden), empty value means all lines are displayed -| lag | [Lag: 2.5] | lag indicator, in seconds (hidden if lag is low) -| hotlist | [Act: 4,2] | list of buffers with activity (unread messages) -| completion | abc(2) def(5) | list of words for completion, with number of possible completions for each word -| scroll | -MORE(50)- | scroll indicator, with number of lines below last line displayed +| Item | Example | Description +| time | [12:55] | time +| buffer_count | [6] | number of opened buffers +| buffer_plugin | [irc/freenode] | plugin of current buffer (irc plugin can add IRC server name used by buffer) +| buffer_number | 3 | current buffer number +| buffer_name | #test(+n) | current buffer name (with channel modes for irc channels) +| buffer_nicklist_count | {5} | number of nicks in nicklist +| buffer_filter | * | filtering indicator: `*` means some lines are filtered (hidden), empty value means all lines are displayed +| lag | [Lag: 2.5] | lag indicator, in seconds (hidden if lag is low) +| hotlist | [Act: 4:#abc(2,5), 6] | list of buffers with activity (unread messages) (in example, 2 highlights and 5 unread messages on '#abc', one unread message on buffer #6) +| completion | abc(2) def(5) | list of words for completion, with number of possible completions for each word +| scroll | -MORE(50)- | scroll indicator, with number of lines below last line displayed |======================================== Bar 'input' has following default items: @@ -395,10 +395,10 @@ Bar 'input' has following default items: |======================================== | Item | Example | Description | input_paste | [Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No] | question to user for pasting lines -| input_prompt | [nick] | input prompt (nick for irc plugin) +| input_prompt | [flashy] | input prompt (nick for irc plugin) | away | (away) | away indicator | input_search | [Text search] | text search indicator -| input_text | bla bla... | input text +| input_text | hi joe! | input text |======================================== [[key_bindings]] diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 3b75160f5..2fb39ce51 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -189,7 +189,7 @@ La touche par défaut alt+'=' active/désactive le filtrage. Les tags les plus couramment utilisés: no_filter, no_highlight, no_log, log0..log9 (niveau de log), - notify_message, notify_private, notify_highlight, + notify_none, notify_message, notify_private, notify_highlight, nick_xxx (xxx est le pseudo dans le message), irc_xxx (xxx est un nom de commande ou nombre, voir /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index 552c88ac8..1a07ebbb5 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -173,6 +173,26 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `blue`) +* *weechat.color.status_count_highlight* +** description: `couleur du texte pour le nombre de highlights dans la hotlist (barre de statut)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `magenta`) + +* *weechat.color.status_count_msg* +** description: `couleur du texte pour le nombre de messages dans la hotlist (barre de statut)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `brown`) + +* *weechat.color.status_count_other* +** description: `couleur du texte pour le nombre d'autres messages dans la hotlist (barre de statut)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `default`) + +* *weechat.color.status_count_private* +** description: `couleur du texte pour le nombre de messages privés dans la hotlist (barre de statut)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `green`) + * *weechat.color.status_data_highlight* ** description: `couleur du texte pour un tampon avec un highlight (barre de statut)` ** type: couleur @@ -353,6 +373,21 @@ ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"-"`) +* *weechat.look.hotlist_buffer_separator* +** description: `chaîne affichée entre les tampons dans la hotlist` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `", "`) + +* *weechat.look.hotlist_count_max* +** description: `nombre maximum de compteurs de messages à afficher dans la hotlist pour un tampon (0 = ne jamais afficher les compteurs de messages)` +** type: entier +** valeurs: 0 .. 4 (valeur par défaut: `2`) + +* *weechat.look.hotlist_count_min_msg* +** description: `afficher les compteurs de messages si le nombre de messages est supérieur ou égal à cette valeur` +** type: entier +** valeurs: 1 .. 100 (valeur par défaut: `2`) + * *weechat.look.hotlist_names_count* ** description: `nombre maximum de noms dans la liste d'activité (0 = pas de nom affiché, seulement les numéros de tampons)` ** type: entier diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 0742532ee..95cc307db 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -361,7 +361,7 @@ Exemple de terminal avec WeeChat : │ │ │ │ │ │ │ │ │ -│[12:55] [4] [irc/freenode] 3:#test(+n){5}* [Act: 4,2] │ +│[12:55] [6] [irc/freenode] 3:#test(+n){5}* [Act: 4:#abc(2,5), 6] │ │[flashy] salut joe !█ │ └─────────────────────────────────────────────────────────────────────────────────────────┘ ........................................ @@ -383,18 +383,18 @@ La barre 'status' contient les objets (items) suivants par défaut : [width="100%",cols="^3,^3l,10",options="header"] |======================================== -| Objet (item) | Exemple | Description -| time | [12:55] | heure -| buffer_count | [4] | nombre de tampons ouverts -| buffer_plugin | [irc/freenode] | extension du tampon courant (l'extension irc peut afficher le nom du serveur IRC auquel est rattaché ce tampon) -| buffer_number | 3 | numéro du tampon courant -| buffer_name | #test(+n) | nom du tampon courant -| buffer_nicklist_count | {5} | nombre de pseudos dans la liste des pseudos -| buffer_filter | * | indicateur de filtrage : `*` signifie que des lignes sont filtrées (cachées), une valeur vide signifie que toutes les lignes sont affichées -| lag | [Lag: 2.5] | indicateur de "lag" (ralentissements réseau), en secondes (caché si le lag est faible) -| hotlist | [Act: 4,2] | liste des tampons où il y a de l'activité (messages non lus) -| completion | abc(2) def(5) | liste des mots pour la complétion, avec le nombre de complétions possibles pour chaque mot -| scroll | -PLUS(50)- | indicateur de scroll, avec le nombre de lignes sous la dernière ligne affichée +| Objet (item) | Exemple | Description +| time | [12:55] | heure +| buffer_count | [6] | nombre de tampons ouverts +| buffer_plugin | [irc/freenode] | extension du tampon courant (l'extension irc peut afficher le nom du serveur IRC auquel est rattaché ce tampon) +| buffer_number | 3 | numéro du tampon courant +| buffer_name | #test(+n) | nom du tampon courant (avec les modes du canal pour les canaux irc) +| buffer_nicklist_count | {5} | nombre de pseudos dans la liste des pseudos +| buffer_filter | * | indicateur de filtrage : `*` signifie que des lignes sont filtrées (cachées), une valeur vide signifie que toutes les lignes sont affichées +| lag | [Lag: 2.5] | indicateur de "lag" (ralentissements réseau), en secondes (caché si le lag est faible) +| hotlist | [Act: 4:#abc(2,5), 6] | liste des tampons où il y a de l'activité (messages non lus) (dans cet exemple, 2 highlights et 5 messages non lus sur '#abc', un message non lu sur le buffer numéro 6) +| completion | abc(2) def(5) | liste des mots pour la complétion, avec le nombre de complétions possibles pour chaque mot +| scroll | -PLUS(50)- | indicateur de scroll, avec le nombre de lignes sous la dernière ligne affichée |======================================== La barre 'input' contient les objets (items) suivants par défaut : @@ -403,10 +403,10 @@ La barre 'input' contient les objets (items) suivants par défaut : |======================================== | Objet (item) | Exemple | Description | input_paste | [Coller 7 lignes ? [ctrl-Y] Oui [ctrl-N] Non] | question à l'utilisateur pour coller des lignes -| input_prompt | [pseudo] | prompt (pseudo pour l'extension irc) +| input_prompt | [flashy] | prompt (pseudo pour l'extension irc) | away | (absent) | indicateur d'absence | input_search | [Recherche texte] | indicateur de recherche de texte -| input_text | bla bla... | texte entré +| input_text | salut joe ! | texte entré |======================================== [[key_bindings]] diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index 68d427c64..3251f3df7 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -166,51 +166,51 @@ windows: mostra l'albero delle finestre add <nome> <buffer>[,<buffer>...] <tag> <regex>] del <nome>|-all - list: elenca tutti i filtri - enable: abilita filtri (i filtri sono abilitati di default) - disable: disabilita filtri - toggle: abilita/disabilita filtri - nome: nome del filtro - add: aggiunge un filtro - del: elimina un filtro - -all: elimina tutti i filtri - buffer: elenco separato da virgole di buffer in cui il filtro è attivo: - - nome completo che include il plugin (esempio: "irc.freenode.#weechat) - - "*" indica tutti i buffer - - un nome preceduto da '!' viene escluso - - un nome può iniziare o terminare con '*' per includere più buffer - tag: elenco di tag separati da virgole, per esempio: "irc_join,irc_part,irc_quit" - regex: espressione regolare da cercare nella riga - - usare '\t' per separare il prefisso dal messaggio, caratteri speciali come "|" vanno preceduti dal carattere escape: '\|') - - se l'espressione regolare inizia con '!', il risultato corrispondente viene invertito (usare '\!' per iniziare con '!') - - -vengono create due espressioni regolari: una per il prefisso e l'altra per il messaggio - -Il tasto predefinito alt+'=' abilita/disabilita il filtro. - -Tag utilizzati di frequente: - no_filter, no_highlight, no_log, log0..log9 (livello di log), - notify_message, notify_private, notify_highlight, - nick_xxx (xxx è il nick nel messaggio), - irc_xxx (xxx è il nome comando o il numero, consultare /server raw), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. + list: list all filters + enable: enable filters (filters are enabled by default) +disable: disable filters + toggle: toggle filters + name: filter name + add: add a filter + del: delete a filter + -all: delete all filters + buffer: comma separated list of buffers where filter is active: + - this is full name including plugin (example: "irc.freenode.#weechat") + - "*" means all buffers + - a name starting with '!' is excluded + - name can start or end with '*' to match many buffers + tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit" + regex: regular expression to search in line + - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|' + - if regex starts with '!', then matching result is reversed (use '\!' to start with '!') + - two regular expressions are created: one for prefix and one for message + +The default key alt+'=' toggles filtering on/off. + +Tags most commonly used: + no_filter, no_highlight, no_log, log0..log9 (log level), + notify_none, notify_message, notify_private, notify_highlight, + nick_xxx (xxx is nick in message), + irc_xxx (xxx is command name or number, see /server raw), + irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. -Esempi: - usa il filtro intelligente IRC per tutti i buffer: - /filter add irc_smart * irc_smart_filter * - usa il filtro intelligente IRC su tutti i buffer tranne quelli che contengono "#weechat" nel nome: - /filter add irc_smart *,!*weechat* irc_smart_filter - filtra tutti i messaggi entrata/uscita/abbandono di IRC: - /filter add joinquit * irc_join,irc_part,irc_quit * - filtra i nick visualizzati all'ingresso in un canale o con /names: +Examples: + use IRC smart filter on all buffers: + /filter add irc_smart * irc_smart_filter * + use IRC smart filter on all buffers except those with "#weechat" in name: + /filter add irc_smart *,!*#weechat* irc_smart_filter * + filter all IRC join/part/quit messages: + /filter add joinquit * irc_join,irc_part,irc_quit * + filter nicks displayed when joining channels or with /names: /filter add nicks * irc_366 * - filtra il nick "tizio" sul canale IRC #weechat - /filter add tizio irc.freenode.#esempio * tizio\t - filtra solo il nick "caio" sul canale IRC #test: - /filter add caio irc.freenode.#test * !caio\t - filtra le righe contententi la parola "spam": + filter nick "toto" on IRC channel #weechat: + /filter add toto irc.freenode.#weechat * toto\t + keep only nick "titi" on IRC channel #test: + /filter add titi irc.freenode.#test * !titi\t + filter lines containing word "spam": /filter add filterspam * * spam - filtra le righe contententi "weechat fa schifo" sul canale IRC #weechat: - /filter add schifo irc.freenode.#weechat * weechat fa schifo + filter lines containing "weechat sucks" on IRC channel #weechat: + /filter add sucks irc.freenode.#weechat * weechat sucks ........................................ [command]*`help`* visualizza l'aiuto su comandi e opzioni:: diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index 9e04d94ae..c4eca18ac 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -173,6 +173,26 @@ ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `blue`) +* *weechat.color.status_count_highlight* +** descrizione: `text color for count of highlight messages in hotlist (status bar)` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `magenta`) + +* *weechat.color.status_count_msg* +** descrizione: `text color for count of messages in hotlist (status bar)` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `brown`) + +* *weechat.color.status_count_other* +** descrizione: `text color for count of other messages in hotlist (status bar)` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `default`) + +* *weechat.color.status_count_private* +** descrizione: `text color for count of private messages in hotlist (status bar)` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `green`) + * *weechat.color.status_data_highlight* ** descrizione: `colore del testo per il buffer con evento (barra di stato)` ** tipo: colore @@ -353,6 +373,21 @@ ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"-"`) +* *weechat.look.hotlist_buffer_separator* +** descrizione: `string displayed between buffers in hotlist` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `", "`) + +* *weechat.look.hotlist_count_max* +** descrizione: `max number of messages count to display in hotlist for a buffer (0 = never display messages count)` +** tipo: intero +** valori: 0 .. 4 (valore predefinito: `2`) + +* *weechat.look.hotlist_count_min_msg* +** descrizione: `display messages count if number of messages is greater or equal to this value` +** tipo: intero +** valori: 1 .. 100 (valore predefinito: `2`) + * *weechat.look.hotlist_names_count* ** descrizione: `numero massimo di nomi nella hotlist (0 = nessun nome visualizzato, solo numeri dei buffer)` ** tipo: intero diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index d7d36a511..58fa5edf5 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -361,8 +361,8 @@ Esempio di terminale con WeeChat: │ │ │ │ │ │ │ │ │ -│[12:55] [4] [irc/freenode] 3:#test(+n){5}* [Attività: 4,2] │ │ -│[flashy] ciao joe!█ │ │ +│[12:55] [6] [irc/freenode] 3:#test(+n){5}* [Att: 4:#abc(2,5), 6] │ +│[flashy] ciao joe!█ │ └─────────────────────────────────────────────────────────────────────────────────────────┘ ........................................ @@ -382,18 +382,20 @@ La barra 'stato' ha i seguenti elementi predefiniti: [width="100%",cols="^3,^3l,10",options="header"] |======================================== -| Elemento | Esempio | Descrizione -| time | [12:55] | ora -| buffer_count | [4] | numero di buffer aperti -| buffer_plugin | [irc/freenode] | plugin del buffer attivo (il plugin irc può aggiungere il nome del server irc usato dal buffer) -| buffer_number | 3 | numero del buffer corrente -| buffer_name | #test(+n) | nome del buffer attivo -| buffer_nicklist_count | {5} | numero di nick nella lista nick -| buffer_filter | * | indicatore filtraggio: `*` significa che alcune righe sono filtrate (nascoste), valori vuoti indicano che tutte le righe sono visualizzate -| lag | [Ritardo: 2.5] | indicatore ritardo, in secondi (nascosto se il ritardo è basso) -| hotlist | [Attività: 4,2] | elenco dei buffer con attività (messaggi non letti) -| completion | abc(2) def(5) | elenco di parole per il completamento, con il numero di completamenti possibili per ogni parola -| scroll | -ANCORA(50)- | indicatore di scorrimento, con il numero di righe sotto l'ultima riga visualizzata +| Elemento | Esempio | Descrizione +| time | [12:55] | ora +| buffer_count | [6] | numero di buffer aperti +| buffer_plugin | [irc/freenode] | plugin del buffer attivo (il plugin irc può aggiungere il nome del server irc usato dal buffer) +| buffer_number | 3 | numero del buffer corrente +// TRANSLATION MISSING +| buffer_name | #test(+n) | nome del buffer attivo (with channel modes for irc channels) +| buffer_nicklist_count | {5} | numero di nick nella lista nick +| buffer_filter | * | indicatore filtraggio: `*` significa che alcune righe sono filtrate (nascoste), valori vuoti indicano che tutte le righe sono visualizzate +| lag | [Ritardo: 2.5] | indicatore ritardo, in secondi (nascosto se il ritardo è basso) +// TRANSLATION MISSING +| hotlist | [Att: 4:#abc(2,5), 6] | elenco dei buffer con attività (messaggi non letti) (in example, 2 highlights and 5 unread messages on '#abc', one unread message on buffer #6) +| completion | abc(2) def(5) | elenco di parole per il completamento, con il numero di completamenti possibili per ogni parola +| scroll | -ANCORA(50)- | indicatore di scorrimento, con il numero di righe sotto l'ultima riga visualizzata |======================================== La barra 'input' ha i seguenti elementi predefiniti: @@ -402,10 +404,10 @@ La barra 'input' ha i seguenti elementi predefiniti: |======================================== | Elemento | Esempio | Descrizione | input_paste | [Incollare 7 righe ? [ctrl-Y] Sì [ctrl-N] No] | chiede all'utente se incollare le righe -| input_prompt | [nick] | prompt per l'input (nick per il plugin irc) +| input_prompt | [flashy] | prompt per l'input (nick per il plugin irc) | away | (assente) | indicatore di assenza | input_search | [Ricerca testo] | indicatore di ricerca testo -| input_text | bla bla... | testo in input +| input_text | ciao joe! | testo in input |======================================== [[key_bindings]] @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:21+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-10 17:32+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: Czech\n" @@ -1120,7 +1120,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2011,6 +2011,20 @@ msgstr "" "hodnota vykreslí skutečnou čáru při použití ncurses, ale může způsobit " "problém s výběrem URL v některých terminálech" +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "seznam bufferů v hotlistu" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2322,13 +2336,28 @@ msgstr "barva textu pro buffer se zvýrazněním (stavový řádek)" msgid "text color for buffer with new data (not messages) (status bar)" msgstr "barva textu pro buffer s novými daty (ne zprávami) (status bar)" +#, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "barva textu pro buffer se zvýrazněním (stavový řádek)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "barva textu pro buffer se zvýrazněním (stavový řádek)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "barva textu pro buffer se zvýrazněním (stavový řádek)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "barva textu pro buffer se zvýrazněním (stavový řádek)" + msgid "text color for buffer with new data (status bar)" msgstr "barva textu pro buffer s novými daty (status bar)" msgid "text color for time (status bar)" msgstr "barva textu pro čas (stavový řádek)" -#, fuzzy msgid "text color for unsuccessful text search in input line" msgstr "barva textu pro nepovedené hledání textu ve vstupní rádce" @@ -2824,8 +2853,9 @@ msgstr "Vyhledávání textu (přesné)" msgid "%s-MORE(%d)-" msgstr "%s-VÍCE(%d)-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " -msgstr "Aktivní: " +msgstr "Akt: " #, c-format msgid "Notify changed for \"%s%s.%s%s\": \"%s%s%s\" to \"%s%s%s\"" @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:21+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-10 17:33+0200\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: \n" @@ -1127,6 +1127,7 @@ msgstr "" "list || enable|disable|toggle [<name>] || add <name> <buffer>[,<buffer>...] " "<tags> <regex> || del <name>|-all" +#, fuzzy msgid "" " list: list all filters\n" " enable: enable filters (filters are enabled by default)\n" @@ -1156,7 +1157,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2176,6 +2177,20 @@ msgstr "" "Linie. Dies kann allerdings bei einigen Terminals zu Fehlern führen, falls " "die URL Auswahl genutzt wird. Wide Chars sind für diese Option NICHT erlaubt." +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "Liste der Buffer in Hotlist" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2514,13 +2529,28 @@ msgid "text color for buffer with new data (not messages) (status bar)" msgstr "" "Farbe eines Buffers mit neuen Daten (nicht Nachrichten in der Statusbar)" +#, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "Farbe eines Buffers mit Highlight-Nachricht (Statusbar)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "Farbe eines Buffers mit Highlight-Nachricht (Statusbar)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "Farbe eines Buffers mit Highlight-Nachricht (Statusbar)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "Farbe eines Buffers mit Highlight-Nachricht (Statusbar)" + msgid "text color for buffer with new data (status bar)" msgstr "Farbe eines Buffers mit neuen Daten (Statusbar)" msgid "text color for time (status bar)" msgstr "Textfarbe für die Uhrzeit (Statusbar)" -#, fuzzy msgid "text color for unsuccessful text search in input line" msgstr "Textfarbe in der Eingabezeile bei einer erfolglosen Textsuche " @@ -3035,8 +3065,9 @@ msgstr "Textsuche (genau)" msgid "%s-MORE(%d)-" msgstr "%s-MEHR(%d)-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " -msgstr "Aktiv: " +msgstr "Akt: " #, c-format msgid "Notify changed for \"%s%s.%s%s\": \"%s%s%s\" to \"%s%s%s\"" @@ -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-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:21+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-10 17:31+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: Spanish\n" @@ -1143,7 +1143,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2062,6 +2062,20 @@ msgstr "" "dibujará una línea verdadera con ncurses, pero puede causar errores con la " "selección de URLs en algunas terminales" +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "lista de buffers en la lista de actividad" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2386,13 +2400,28 @@ msgstr "color para una buffer con texto resaltado (barra de estado)" msgid "text color for buffer with new data (not messages) (status bar)" msgstr "color para un buffer con nuevos datos (no mensajes) (barra de estado)" +#, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "color para una buffer con texto resaltado (barra de estado)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "color para una buffer con texto resaltado (barra de estado)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "color para una buffer con texto resaltado (barra de estado)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "color para una buffer con texto resaltado (barra de estado)" + msgid "text color for buffer with new data (status bar)" msgstr "color para un buffer con nuevos datos (barra de estado)" msgid "text color for time (status bar)" msgstr "color para el texto de la hora (en la barra de estado)" -#, fuzzy msgid "text color for unsuccessful text search in input line" msgstr "color para una búsqueda fallida en la línea de entrada" @@ -2894,6 +2923,7 @@ msgstr "Búsqueda de texto (exacto)" msgid "%s-MORE(%d)-" msgstr "%s-MÁS(%d)-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " msgstr "Act: " @@ -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-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:21+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-11 11:50+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -1143,7 +1143,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -1198,7 +1198,7 @@ msgstr "" "\n" "Les tags les plus couramment utilisés:\n" " no_filter, no_highlight, no_log, log0..log9 (niveau de log),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx est le pseudo dans le message),\n" " irc_xxx (xxx est un nom de commande ou nombre, voir /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2121,6 +2121,23 @@ msgstr "" "problèmes d'affichage avec la sélection d'URL sous certains terminaux), les " "caractères larges ne sont PAS autorisés ici" +msgid "string displayed between buffers in hotlist" +msgstr "chaîne affichée entre les tampons dans la hotlist" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" +"nombre maximum de compteurs de messages à afficher dans la hotlist pour un " +"tampon (0 = ne jamais afficher les compteurs de messages)" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" +"afficher les compteurs de messages si le nombre de messages est supérieur ou " +"égal à cette valeur" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2459,6 +2476,25 @@ msgstr "" "couleur du texte pour un tampon avec des nouvelles données (pas des " "messages) (barre de statut)" +msgid "text color for count of messages in hotlist (status bar)" +msgstr "" +"couleur du texte pour le nombre de messages dans la hotlist (barre de statut)" + +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "" +"couleur du texte pour le nombre de messages privés dans la hotlist (barre de " +"statut)" + +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "" +"couleur du texte pour le nombre de highlights dans la hotlist (barre de " +"statut)" + +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "" +"couleur du texte pour le nombre d'autres messages dans la hotlist (barre de " +"statut)" + msgid "text color for buffer with new data (status bar)" msgstr "" "couleur du texte pour un tampon avec des nouvelles données (barre de statut)" @@ -2466,7 +2502,6 @@ msgstr "" msgid "text color for time (status bar)" msgstr "couleur du texte pour l'heure (barre de statut)" -#, fuzzy msgid "text color for unsuccessful text search in input line" msgstr "" "couleur du texte pour la recherche infructueuse de texte dans la ligne de " @@ -2978,6 +3013,7 @@ msgstr "Recherche texte (exact)" msgid "%s-MORE(%d)-" msgstr "%s-PLUS(%d)-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " msgstr "Act: " @@ -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-04-10 10:36+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" "PO-Revision-Date: 2011-04-10 11:21+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1083,7 +1083,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -1794,6 +1794,20 @@ msgid "" "terminals), wide chars are NOT allowed here" msgstr "" +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "kiemelendő szavak listája" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2118,6 +2132,22 @@ msgid "text color for buffer with new data (not messages) (status bar)" msgstr "új adatot tartalmazó ablak színe (nem üzenetek) (státuszsor)" #, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)" + +#, fuzzy msgid "text color for buffer with new data (status bar)" msgstr "új adatot tartalmazó ablak színe (státuszsor)" @@ -2624,6 +2654,7 @@ msgstr "Szöveg keresése (pontos): " msgid "%s-MORE(%d)-" msgstr "-TOVÁBB-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " msgstr "Akt: " @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:21+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-10 17:33+0200\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: Italian\n" @@ -1105,6 +1105,7 @@ msgstr "" "list || enable|disable|toggle [<nome>] || add <nome> <buffer>[,<buffer>...] " "<tag> <regex>] || del <nome>|-all" +#, fuzzy msgid "" " list: list all filters\n" " enable: enable filters (filters are enabled by default)\n" @@ -1134,7 +1135,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2112,6 +2113,20 @@ msgstr "" "con la selezione dell'URL in alcuni terminali), i caratteri wide NON sono " "consentiti" +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "elenco dei buffer nella hotlist" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2441,13 +2456,28 @@ msgid "text color for buffer with new data (not messages) (status bar)" msgstr "" "colore del testo per il buffer con nuovi dati (non messaggi) (barra di stato)" +#, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "colore del testo per il buffer con evento (barra di stato)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "colore del testo per il buffer con evento (barra di stato)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "colore del testo per il buffer con evento (barra di stato)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "colore del testo per il buffer con evento (barra di stato)" + msgid "text color for buffer with new data (status bar)" msgstr "colore del testo per il buffer con nuovi dati (barra di stato)" msgid "text color for time (status bar)" msgstr "colore del testo per l'ora (barra di stato)" -#, fuzzy msgid "text color for unsuccessful text search in input line" msgstr "colore del testo per la ricerca del testo fallita sulla riga di input" @@ -2954,8 +2984,9 @@ msgstr "Ricerca testo (esatta)" msgid "%s-MORE(%d)-" msgstr "%s-ANCORA(%d)-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " -msgstr "Attività: " +msgstr "Att: " #, c-format msgid "Notify changed for \"%s%s.%s%s\": \"%s%s%s\" to \"%s%s%s\"" @@ -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-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:00+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-10 17:32+0200\n" "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: Polish\n" @@ -1147,7 +1147,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2068,6 +2068,20 @@ msgstr "" "linii w ncurses, jednak może powodowac błędy w zaznaczaniu URLi w niektórych " "terminalach" +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "lista buforów w hotliście" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2384,13 +2398,28 @@ msgstr "kolor bufora z podświetleniem (pasek statusu)" msgid "text color for buffer with new data (not messages) (status bar)" msgstr "kolor bufora z nowymi zdarzeniami (nie wiadomościami) (pasek statusu)" +#, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "kolor bufora z podświetleniem (pasek statusu)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "kolor bufora z podświetleniem (pasek statusu)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "kolor bufora z podświetleniem (pasek statusu)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "kolor bufora z podświetleniem (pasek statusu)" + msgid "text color for buffer with new data (status bar)" msgstr "kolor bufora z nowymi zdarzeniami (pasek statusu)" msgid "text color for time (status bar)" msgstr "kolor czasu (pasek statusu)" -#, fuzzy msgid "text color for unsuccessful text search in input line" msgstr "kolor nieudanego wyszukiwania tekstu w wprowadzonej linii" @@ -2886,6 +2915,7 @@ msgstr "Wyszukiwanie tekstu (dokładne)" msgid "%s-MORE(%d)-" msgstr "%s-Więcej(%d)-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " msgstr "Akt: " diff --git a/po/pt_BR.po b/po/pt_BR.po index a2f7e9113..9f86cefd1 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-04-10 10:36+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" "PO-Revision-Date: 2011-04-10 11:22+0200\n" "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1133,7 +1133,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -2059,6 +2059,19 @@ msgstr "" "vai desenha ruma linha real com ncurses, mas pode causar bugs com seleção de " "URL em alguns terminais" +msgid "string displayed between buffers in hotlist" +msgstr "" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + # Find a better translation to 'hotlist' #, fuzzy msgid "" @@ -2344,6 +2357,18 @@ msgstr "" msgid "text color for buffer with new data (not messages) (status bar)" msgstr "" +msgid "text color for count of messages in hotlist (status bar)" +msgstr "" + +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "" + +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "" + +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "" + msgid "text color for buffer with new data (status bar)" msgstr "" @@ -2799,6 +2824,7 @@ msgstr "" msgid "%s-MORE(%d)-" msgstr "" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " msgstr "" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-10 10:36+0200\n" -"PO-Revision-Date: 2011-04-10 11:22+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" +"PO-Revision-Date: 2011-04-10 17:33+0200\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: Russian\n" @@ -1091,7 +1091,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -1803,6 +1803,20 @@ msgid "" "terminals), wide chars are NOT allowed here" msgstr "" +#, fuzzy +msgid "string displayed between buffers in hotlist" +msgstr "максимальная длина имён в хотлисте" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -2136,6 +2150,22 @@ msgid "text color for buffer with new data (not messages) (status bar)" msgstr "цвет окна с новыми данными (но не сообщениями) (в строке состояния)" #, fuzzy +msgid "text color for count of messages in hotlist (status bar)" +msgstr "цвет окна с подсвеченным сообщением (в строке состояния)" + +#, fuzzy +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "цвет окна с подсвеченным сообщением (в строке состояния)" + +#, fuzzy +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "цвет окна с подсвеченным сообщением (в строке состояния)" + +#, fuzzy +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "цвет окна с подсвеченным сообщением (в строке состояния)" + +#, fuzzy msgid "text color for buffer with new data (status bar)" msgstr "цвет окна с новыми данными (в строке состояния)" @@ -2643,8 +2673,9 @@ msgstr "Поиск текста (регистрозависимый): " msgid "%s-MORE(%d)-" msgstr "-ДАЛЬШЕ-" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " -msgstr "Активны: " +msgstr "" #, fuzzy, c-format msgid "Notify changed for \"%s%s.%s%s\": \"%s%s%s\" to \"%s%s%s\"" diff --git a/po/weechat.pot b/po/weechat.pot index 2ee8e7002..cdec29bd3 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-04-10 10:36+0200\n" +"POT-Creation-Date: 2011-04-11 11:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -941,7 +941,7 @@ msgid "" "\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" -" notify_message, notify_private, notify_highlight,\n" +" notify_none, notify_message, notify_private, notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -1549,6 +1549,19 @@ msgid "" "terminals), wide chars are NOT allowed here" msgstr "" +msgid "string displayed between buffers in hotlist" +msgstr "" + +msgid "" +"max number of messages count to display in hotlist for a buffer (0 = never " +"display messages count)" +msgstr "" + +msgid "" +"display messages count if number of messages is greater or equal to this " +"value" +msgstr "" + msgid "" "max number of names in hotlist (0 = no name displayed, only buffer numbers)" msgstr "" @@ -1819,6 +1832,18 @@ msgstr "" msgid "text color for buffer with new data (not messages) (status bar)" msgstr "" +msgid "text color for count of messages in hotlist (status bar)" +msgstr "" + +msgid "text color for count of private messages in hotlist (status bar)" +msgstr "" + +msgid "text color for count of highlight messages in hotlist (status bar)" +msgstr "" + +msgid "text color for count of other messages in hotlist (status bar)" +msgstr "" + msgid "text color for buffer with new data (status bar)" msgstr "" @@ -2272,6 +2297,7 @@ msgstr "" msgid "%s-MORE(%d)-" msgstr "" +#. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) msgid "Act: " msgstr "" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index ef159092e..e350ddd25 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -4818,7 +4818,8 @@ command_init () "The default key alt+'=' toggles filtering on/off.\n\n" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" - " notify_message, notify_private, notify_highlight,\n" + " notify_none, notify_message, notify_private, " + "notify_highlight,\n" " nick_xxx (xxx is nick in message),\n" " irc_xxx (xxx is command name or number, see /server raw),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, " diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 4cff94579..aad659c53 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -88,6 +88,9 @@ struct t_config_option *config_look_highlight; struct t_config_option *config_look_highlight_regex; struct t_config_option *config_look_highlight_tags; struct t_config_option *config_look_hline_char; +struct t_config_option *config_look_hotlist_buffer_separator; +struct t_config_option *config_look_hotlist_count_max; +struct t_config_option *config_look_hotlist_count_min_msg; struct t_config_option *config_look_hotlist_names_count; struct t_config_option *config_look_hotlist_names_length; struct t_config_option *config_look_hotlist_names_level; @@ -161,6 +164,10 @@ struct t_config_option *config_color_status_data_msg; struct t_config_option *config_color_status_data_private; struct t_config_option *config_color_status_data_highlight; struct t_config_option *config_color_status_data_other; +struct t_config_option *config_color_status_count_msg; +struct t_config_option *config_color_status_count_private; +struct t_config_option *config_color_status_count_highlight; +struct t_config_option *config_color_status_count_other; struct t_config_option *config_color_status_more; struct t_config_option *config_color_status_time; struct t_config_option *config_color_input_text_not_found; @@ -1595,6 +1602,23 @@ config_weechat_init_options () "will draw a real line with ncurses, but may cause bugs with URL " "selection under some terminals), wide chars are NOT allowed here"), NULL, 0, 0, "-", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); + config_look_hotlist_buffer_separator = config_file_new_option ( + weechat_config_file, ptr_section, + "hotlist_buffer_separator", "string", + N_("string displayed between buffers in hotlist"), + NULL, 0, 0, ", ", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_hotlist_count_max = config_file_new_option ( + weechat_config_file, ptr_section, + "hotlist_count_max", "integer", + N_("max number of messages count to display in hotlist for a buffer " + "(0 = never display messages count)"), + NULL, 0, GUI_HOTLIST_NUM_PRIORITIES, "2", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_hotlist_count_min_msg = config_file_new_option ( + weechat_config_file, ptr_section, + "hotlist_count_min_msg", "integer", + N_("display messages count if number of messages is greater or equal " + "to this value"), + NULL, 1, 100, "2", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); config_look_hotlist_names_count = config_file_new_option ( weechat_config_file, ptr_section, "hotlist_names_count", "integer", @@ -2089,6 +2113,30 @@ config_weechat_init_options () "(status bar)"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, &config_change_color, NULL, NULL, NULL); + config_color_status_count_msg = config_file_new_option ( + weechat_config_file, ptr_section, + "status_count_msg", "color", + N_("text color for count of messages in hotlist (status bar)"), + NULL, -1, 0, "brown", NULL, 0, + NULL, NULL, &config_change_color, NULL, NULL, NULL); + config_color_status_count_private = config_file_new_option ( + weechat_config_file, ptr_section, + "status_count_private", "color", + N_("text color for count of private messages in hotlist (status bar)"), + NULL, -1, 0, "green", NULL, 0, + NULL, NULL, &config_change_color, NULL, NULL, NULL); + config_color_status_count_highlight = config_file_new_option ( + weechat_config_file, ptr_section, + "status_count_highlight", "color", + N_("text color for count of highlight messages in hotlist (status bar)"), + NULL, -1, 0, "magenta", NULL, 0, + NULL, NULL, &config_change_color, NULL, NULL, NULL); + config_color_status_count_other = config_file_new_option ( + weechat_config_file, ptr_section, + "status_count_other", "color", + N_("text color for count of other messages in hotlist (status bar)"), + NULL, -1, 0, "default", NULL, 0, + NULL, NULL, &config_change_color, NULL, NULL, NULL); config_color_status_more = config_file_new_option ( weechat_config_file, ptr_section, "status_more", "color", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 002e07ee4..de7f62fe3 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -114,6 +114,9 @@ extern struct t_config_option *config_look_day_change_time_format; extern struct t_config_option *config_look_highlight; extern struct t_config_option *config_look_highlight_regex; extern struct t_config_option *config_look_hline_char; +extern struct t_config_option *config_look_hotlist_buffer_separator; +extern struct t_config_option *config_look_hotlist_count_max; +extern struct t_config_option *config_look_hotlist_count_min_msg; extern struct t_config_option *config_look_hotlist_names_count; extern struct t_config_option *config_look_hotlist_names_length; extern struct t_config_option *config_look_hotlist_names_level; @@ -185,6 +188,10 @@ extern struct t_config_option *config_color_status_data_msg; extern struct t_config_option *config_color_status_data_private; extern struct t_config_option *config_color_status_data_highlight; extern struct t_config_option *config_color_status_data_other; +extern struct t_config_option *config_color_status_count_msg; +extern struct t_config_option *config_color_status_count_private; +extern struct t_config_option *config_color_status_count_highlight; +extern struct t_config_option *config_color_status_count_other; extern struct t_config_option *config_color_status_more; extern struct t_config_option *config_color_status_time; extern struct t_config_option *config_color_input_text_not_found; diff --git a/src/core/wee-upgrade.c b/src/core/wee-upgrade.c index 2c2eb4963..4e351853c 100644 --- a/src/core/wee-upgrade.c +++ b/src/core/wee-upgrade.c @@ -304,9 +304,10 @@ upgrade_weechat_read_cb (void *data, struct t_gui_nick_group *ptr_group; struct t_gui_buffer *ptr_buffer, *ptr_buffer_for_merge; struct t_gui_line *new_line; + struct t_gui_hotlist *new_hotlist; struct timeval creation_time; void *buf; - int size, index, length; + int i, size, index, length; /* make C compiler happy */ (void) data; @@ -563,10 +564,20 @@ upgrade_weechat_read_cb (void *data, if (buf) { memcpy (&creation_time, buf, size); - gui_hotlist_add (ptr_buffer, - infolist_integer (infolist, "priority"), - &creation_time, - 1); + new_hotlist = gui_hotlist_add (ptr_buffer, + infolist_integer (infolist, "priority"), + &creation_time, + 1); + if (new_hotlist) + { + for (i = 0; i < GUI_HOTLIST_NUM_PRIORITIES; i++) + { + snprintf (option_name, sizeof (option_name), + "count_%02d", i); + new_hotlist->count[i] = infolist_integer (infolist, + option_name); + } + } } } } diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index e3c589872..148be7724 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -1034,6 +1034,7 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, char buf[2048], format[32], *buffer_without_name_displayed; struct t_gui_hotlist *ptr_hotlist; int numbers_count, names_count, display_name; + int priority, priority_min, priority_min_displayed, private; /* make C compiler happy */ (void) data; @@ -1045,6 +1046,7 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, buf[0] = '\0'; + /* TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english) */ strcat (buf, _("Act: ")); buffer_without_name_displayed = NULL; @@ -1088,10 +1090,12 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, if (display_name || !buffer_without_name_displayed || (buffer_without_name_displayed[ptr_hotlist->buffer->number - 1] == 0)) { - if (numbers_count > 0) + if ((numbers_count > 0) + && (CONFIG_STRING(config_look_hotlist_buffer_separator)) + && (CONFIG_STRING(config_look_hotlist_buffer_separator)[0])) { strcat (buf, GUI_COLOR_CUSTOM_BAR_DELIM); - strcat (buf, ","); + strcat (buf, CONFIG_STRING(config_look_hotlist_buffer_separator)); } switch (ptr_hotlist->priority) @@ -1108,6 +1112,12 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, case GUI_HOTLIST_HIGHLIGHT: strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_data_highlight)))); break; + case GUI_HOTLIST_NUM_PRIORITIES: + /* + * this constant is used to count hotlist priorities only, + * it is never used as priority + */ + break; } sprintf (buf + strlen (buf), "%d", ptr_hotlist->buffer->number); numbers_count++; @@ -1135,6 +1145,71 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, buffer_without_name_displayed[ptr_hotlist->buffer->number - 1] = 1; } + /* display messages count by priority */ + if (CONFIG_INTEGER(config_look_hotlist_count_max) > 0) + { + private = (ptr_hotlist->count[GUI_HOTLIST_PRIVATE] > 0) ? 1 : 0; + priority_min_displayed = ptr_hotlist->priority + 1; + priority_min = ptr_hotlist->priority - CONFIG_INTEGER(config_look_hotlist_count_max); + if (priority_min < 0) + priority_min = 0; + for (priority = ptr_hotlist->priority; + priority >= priority_min; + priority--) + { + if (!private && (priority == GUI_HOTLIST_PRIVATE)) + continue; + if (private && (priority == GUI_HOTLIST_MESSAGE)) + continue; + if (((priority == (int)ptr_hotlist->priority) + && (ptr_hotlist->count[priority] >= CONFIG_INTEGER(config_look_hotlist_count_min_msg))) + || ((priority != (int)ptr_hotlist->priority) + && (ptr_hotlist->count[priority] > 0))) + { + priority_min_displayed = priority; + } + } + if (priority_min_displayed <= (int)ptr_hotlist->priority) + { + for (priority = ptr_hotlist->priority; + priority >= priority_min_displayed; + priority--) + { + if (!private && (priority == GUI_HOTLIST_PRIVATE)) + continue; + if (private && (priority == GUI_HOTLIST_MESSAGE)) + continue; + strcat (buf, GUI_COLOR_CUSTOM_BAR_DELIM); + strcat (buf, (priority == (int)ptr_hotlist->priority) ? "(" : ","); + switch (priority) + { + case GUI_HOTLIST_LOW: + strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_count_other)))); + break; + case GUI_HOTLIST_MESSAGE: + strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_count_msg)))); + break; + case GUI_HOTLIST_PRIVATE: + strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_count_private)))); + break; + case GUI_HOTLIST_HIGHLIGHT: + strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_count_highlight)))); + break; + case GUI_HOTLIST_NUM_PRIORITIES: + /* + * this constant is used to count hotlist priorities only, + * it is never used as priority + */ + break; + } + sprintf (buf + strlen (buf), + "%d", ptr_hotlist->count[priority]); + } + strcat (buf, GUI_COLOR_CUSTOM_BAR_DELIM); + strcat (buf, ")"); + } + } + if (strlen (buf) > sizeof (buf) - 64) break; } diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 6f55badaa..162e1e62b 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -1346,7 +1346,7 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property, error = NULL; number = strtol (value, &error, 10); if (error && !error[0]) - gui_hotlist_add (buffer, number, NULL, 1); + (void) gui_hotlist_add (buffer, number, NULL, 1); } } diff --git a/src/gui/gui-hotlist.c b/src/gui/gui-hotlist.c index ff951868b..953e3ddd2 100644 --- a/src/gui/gui-hotlist.c +++ b/src/gui/gui-hotlist.c @@ -131,7 +131,8 @@ gui_hotlist_free_all (struct t_gui_hotlist **hotlist, */ int -gui_hotlist_check_buffer_notify (struct t_gui_buffer *buffer, int priority) +gui_hotlist_check_buffer_notify (struct t_gui_buffer *buffer, + enum t_gui_hotlist_priority priority) { switch (priority) { @@ -142,6 +143,12 @@ gui_hotlist_check_buffer_notify (struct t_gui_buffer *buffer, int priority) case GUI_HOTLIST_PRIVATE: case GUI_HOTLIST_HIGHLIGHT: return (buffer->notify >= 1); + case GUI_HOTLIST_NUM_PRIORITIES: + /* + * this constant is used to count hotlist priorities only, + * it is never used as priority + */ + break; } return 1; } @@ -152,7 +159,8 @@ gui_hotlist_check_buffer_notify (struct t_gui_buffer *buffer, int priority) */ struct t_gui_hotlist * -gui_hotlist_find_pos (struct t_gui_hotlist *hotlist, struct t_gui_hotlist *new_hotlist) +gui_hotlist_find_pos (struct t_gui_hotlist *hotlist, + struct t_gui_hotlist *new_hotlist) { struct t_gui_hotlist *ptr_hotlist; @@ -267,42 +275,59 @@ gui_hotlist_add_hotlist (struct t_gui_hotlist **hotlist, /* * gui_hotlist_add: add a buffer to hotlist, with priority * if creation_time is NULL, current time is used + * return pointer to hotlist created or changed, or NULL if no + * hotlist was created/changed */ -void -gui_hotlist_add (struct t_gui_buffer *buffer, int priority, +struct t_gui_hotlist * +gui_hotlist_add (struct t_gui_buffer *buffer, + enum t_gui_hotlist_priority priority, struct timeval *creation_time, int allow_current_buffer) { struct t_gui_hotlist *new_hotlist, *ptr_hotlist; + int i, count[GUI_HOTLIST_NUM_PRIORITIES]; if (!buffer || !gui_add_hotlist) - return; + return NULL; /* do not add current buffer */ if ((buffer == gui_current_window->buffer) && (!allow_current_buffer || (!gui_buffer_is_scrolled (buffer)))) - return; + return NULL; /* do not add buffer if it is displayed in a window */ if (buffer->num_displayed > 0) - return; + return NULL; - if (priority < GUI_HOTLIST_MIN) - priority = GUI_HOTLIST_MIN; - else if (priority > GUI_HOTLIST_MAX) + if (priority > GUI_HOTLIST_MAX) priority = GUI_HOTLIST_MAX; /* check if priority is ok according to buffer notify level value */ if (!gui_hotlist_check_buffer_notify (buffer, priority)) - return; + return NULL; + + /* init count */ + for (i = 0; i < GUI_HOTLIST_NUM_PRIORITIES; i++) + { + count[i] = 0; + } ptr_hotlist = gui_hotlist_search (gui_hotlist, buffer); if (ptr_hotlist) { /* return if priority is greater or equal than the one to add */ if (ptr_hotlist->priority >= priority) - return; - /* remove buffer if present with lower priority and go on */ + { + ptr_hotlist->count[priority]++; + gui_hotlist_changed_signal (); + return ptr_hotlist; + } + + /* + * if buffer is present with lower priority: save counts, remove it + * and go on + */ + memcpy (count, ptr_hotlist->count, sizeof (ptr_hotlist->count)); gui_hotlist_free (&gui_hotlist, &last_gui_hotlist, ptr_hotlist); } @@ -311,7 +336,7 @@ gui_hotlist_add (struct t_gui_buffer *buffer, int priority, { log_printf (_("Error: not enough memory to add a buffer to " "hotlist")); - return; + return NULL; } new_hotlist->priority = priority; @@ -321,12 +346,16 @@ gui_hotlist_add (struct t_gui_buffer *buffer, int priority, else gettimeofday (&(new_hotlist->creation_time), NULL); new_hotlist->buffer = buffer; + memcpy (new_hotlist->count, count, sizeof (new_hotlist->count)); + new_hotlist->count[priority]++; new_hotlist->next_hotlist = NULL; new_hotlist->prev_hotlist = NULL; gui_hotlist_add_hotlist (&gui_hotlist, &last_gui_hotlist, new_hotlist); gui_hotlist_changed_signal (); + + return new_hotlist; } /* @@ -345,6 +374,7 @@ gui_hotlist_dup (struct t_gui_hotlist *hotlist) memcpy (&(new_hotlist->creation_time), &(hotlist->creation_time), sizeof (new_hotlist->creation_time)); new_hotlist->buffer = hotlist->buffer; + memcpy (new_hotlist->count, hotlist->count, sizeof (hotlist->count)); new_hotlist->prev_hotlist = NULL; new_hotlist->next_hotlist = NULL; return new_hotlist; @@ -431,6 +461,8 @@ gui_hotlist_add_to_infolist (struct t_infolist *infolist, struct t_gui_hotlist *hotlist) { struct t_infolist_item *ptr_item; + int i; + char option_name[64]; if (!infolist || !hotlist) return 0; @@ -463,6 +495,12 @@ gui_hotlist_add_to_infolist (struct t_infolist *infolist, gui_color_get_name (CONFIG_COLOR(config_color_status_data_highlight)))) return 0; break; + case GUI_HOTLIST_NUM_PRIORITIES: + /* + * this constant is used to count hotlist priorities only, + * it is never used as priority + */ + break; } if (!infolist_new_var_buffer (ptr_item, "creation_time", &(hotlist->creation_time), sizeof (struct timeval))) return 0; @@ -474,6 +512,12 @@ gui_hotlist_add_to_infolist (struct t_infolist *infolist, return 0; if (!infolist_new_var_string (ptr_item, "buffer_name", hotlist->buffer->name)) return 0; + for (i = 0; i < GUI_HOTLIST_NUM_PRIORITIES; i++) + { + snprintf (option_name, sizeof (option_name), "count_%02d", i); + if (!infolist_new_var_integer (ptr_item, option_name, hotlist->count[i])) + return 0; + } return 1; } @@ -486,6 +530,7 @@ void gui_hotlist_print_log () { struct t_gui_hotlist *ptr_hotlist; + int i; for (ptr_hotlist = gui_hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist) @@ -496,6 +541,10 @@ gui_hotlist_print_log () ptr_hotlist->creation_time.tv_sec, ptr_hotlist->creation_time.tv_usec); log_printf (" buffer . . . . . . . . : 0x%lx", ptr_hotlist->buffer); + for (i = 0; i < GUI_HOTLIST_NUM_PRIORITIES; i++) + { + log_printf (" count[%02d]. . . . . . . : %d", i, ptr_hotlist->count[i]); + } log_printf (" prev_hotlist . . . . . : 0x%lx", ptr_hotlist->prev_hotlist); log_printf (" next_hotlist . . . . . : 0x%lx", ptr_hotlist->next_hotlist); } diff --git a/src/gui/gui-hotlist.h b/src/gui/gui-hotlist.h index fe87166e5..69ac2aed3 100644 --- a/src/gui/gui-hotlist.h +++ b/src/gui/gui-hotlist.h @@ -20,22 +20,28 @@ #ifndef __WEECHAT_GUI_HOTLIST_H #define __WEECHAT_GUI_HOTLIST_H 1 -#define GUI_HOTLIST_LOW 0 -#define GUI_HOTLIST_MESSAGE 1 -#define GUI_HOTLIST_PRIVATE 2 -#define GUI_HOTLIST_HIGHLIGHT 3 +enum t_gui_hotlist_priority +{ + GUI_HOTLIST_LOW = 0, + GUI_HOTLIST_MESSAGE, + GUI_HOTLIST_PRIVATE, + GUI_HOTLIST_HIGHLIGHT, + /* number of priorities */ + GUI_HOTLIST_NUM_PRIORITIES, +}; -#define GUI_HOTLIST_MIN 0 -#define GUI_HOTLIST_MAX 3 +#define GUI_HOTLIST_MIN 0 +#define GUI_HOTLIST_MAX (GUI_HOTLIST_NUM_PRIORITIES - 1) struct t_gui_hotlist { - int priority; /* 0=crappy msg (join/part), 1=msg, */ - /* 2=pv, 3=nick highlight */ - struct timeval creation_time; /* time when entry was added */ - struct t_gui_buffer *buffer; /* associated buffer */ - struct t_gui_hotlist *prev_hotlist;/* link to previous hotlist */ - struct t_gui_hotlist *next_hotlist;/* link to next hotlist */ + enum t_gui_hotlist_priority priority; /* 0=crappy msg (join/part), */ + /* 1=msg, 2=pv, 3=nick highlight */ + struct timeval creation_time; /* time when entry was added */ + struct t_gui_buffer *buffer; /* associated buffer */ + int count[GUI_HOTLIST_NUM_PRIORITIES]; /* number of msgs by priority */ + struct t_gui_hotlist *prev_hotlist; /* link to previous hotlist */ + struct t_gui_hotlist *next_hotlist; /* link to next hotlist */ }; /* history variables */ @@ -47,9 +53,10 @@ extern int gui_add_hotlist; /* hotlist functions */ -extern void gui_hotlist_add (struct t_gui_buffer *buffer, int priority, - struct timeval *creation_time, - int allow_current_buffer); +extern struct t_gui_hotlist *gui_hotlist_add (struct t_gui_buffer *buffer, + enum t_gui_hotlist_priority priority, + struct timeval *creation_time, + int allow_current_buffer); extern void gui_hotlist_resort (); extern void gui_hotlist_clear (); extern void gui_hotlist_remove_buffer (struct t_gui_buffer *buffer); diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c index 1f46457ea..9f020b620 100644 --- a/src/gui/gui-line.c +++ b/src/gui/gui-line.c @@ -738,6 +738,8 @@ gui_line_free_all (struct t_gui_buffer *buffer) /* * gui_line_get_notify_level: get notify level for a line + * return -1 if "notify_none" is found (no notify + * for line) */ int @@ -747,6 +749,8 @@ gui_line_get_notify_level (struct t_gui_line *line) for (i = 0; i < line->data->tags_count; i++) { + if (string_strcasecmp (line->data->tags_array[i], "notify_none") == 0) + return -1; if (string_strcasecmp (line->data->tags_array[i], "notify_highlight") == 0) return GUI_HOTLIST_HIGHLIGHT; if (string_strcasecmp (line->data->tags_array[i], "notify_private") == 0) @@ -844,7 +848,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date, { if (new_line->data->highlight) { - gui_hotlist_add (buffer, GUI_HOTLIST_HIGHLIGHT, NULL, 1); + (void) gui_hotlist_add (buffer, GUI_HOTLIST_HIGHLIGHT, NULL, 1); if (!weechat_upgrading) { message_for_signal = gui_chat_build_string_prefix_message (new_line); @@ -871,7 +875,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date, } } if (notify_level >= GUI_HOTLIST_MIN) - gui_hotlist_add (buffer, notify_level, NULL, 1); + (void) gui_hotlist_add (buffer, notify_level, NULL, 1); } } else diff --git a/src/plugins/logger/logger.c b/src/plugins/logger/logger.c index 10463a63a..ca3b2acf7 100644 --- a/src/plugins/logger/logger.c +++ b/src/plugins/logger/logger.c @@ -944,18 +944,19 @@ logger_backlog (struct t_gui_buffer *buffer, const char *filename, int lines) { if (datetime != 0) { - weechat_printf_date_tags (buffer, datetime, "no_highlight", + weechat_printf_date_tags (buffer, datetime, + "no_highlight,notify_none", "%s", pos_message + 1); } else { - weechat_printf_tags (buffer, "no_highlight", + weechat_printf_tags (buffer, "no_highlight,notify_none", "%s", ptr_lines->data); } } else { - weechat_printf_tags (buffer, "no_highlight", + weechat_printf_tags (buffer, "no_highlight,notify_none", "%s", ptr_lines->data); } num_lines++; @@ -965,9 +966,9 @@ logger_backlog (struct t_gui_buffer *buffer, const char *filename, int lines) logger_tail_free (last_lines); if (num_lines > 0) { - weechat_printf (buffer, - _("===\t========== End of backlog (%d lines) =========="), - num_lines); + weechat_printf_tags (buffer, "no_highlight,notify_none", + _("===\t========== End of backlog (%d lines) =========="), + num_lines); weechat_buffer_set (buffer, "unread", ""); } weechat_buffer_set (buffer, "print_hooks_enabled", "1"); |