diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 22 | ||||
| -rw-r--r-- | doc/de/autogen/user/irc_options.txt | 7 | ||||
| -rw-r--r-- | doc/de/weechat_user.de.txt | 84 | ||||
| -rw-r--r-- | doc/en/autogen/user/irc_options.txt | 7 | ||||
| -rw-r--r-- | doc/en/weechat_user.en.txt | 29 | ||||
| -rw-r--r-- | doc/fr/autogen/user/irc_options.txt | 7 | ||||
| -rw-r--r-- | doc/fr/weechat_user.fr.txt | 29 | ||||
| -rw-r--r-- | doc/it/autogen/user/irc_options.txt | 7 | ||||
| -rw-r--r-- | doc/it/weechat_user.it.txt | 94 | ||||
| -rw-r--r-- | po/cs.po | 13 | ||||
| -rw-r--r-- | po/de.po | 13 | ||||
| -rw-r--r-- | po/es.po | 13 | ||||
| -rw-r--r-- | po/fr.po | 53 | ||||
| -rw-r--r-- | po/hu.po | 9 | ||||
| -rw-r--r-- | po/it.po | 13 | ||||
| -rw-r--r-- | po/ja.po | 13 | ||||
| -rw-r--r-- | po/pl.po | 13 | ||||
| -rw-r--r-- | po/pt_BR.po | 12 | ||||
| -rw-r--r-- | po/ru.po | 9 | ||||
| -rw-r--r-- | po/weechat.pot | 9 | ||||
| -rw-r--r-- | src/gui/gui-bar-item.c | 34 | ||||
| -rw-r--r-- | src/gui/gui-bar-item.h | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-bar-item.c | 98 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 42 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.h | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-mode.c | 2 |
27 files changed, 314 insertions, 324 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.9-dev, 2012-07-05 +v0.3.9-dev, 2012-07-07 Version 0.3.9 (under dev!) @@ -24,6 +24,8 @@ Version 0.3.9 (under dev!) * aspell: add missing dictionaries (ast/grc/hus/kn/ky) * guile: fix crash when unloading a script without pointer to interpreter * guile: fix path of guile include dirs in cmake build (patch #7790) +* irc: add bar item "buffer_modes", remove option irc.look.item_channel_modes + (task #12022) * irc: fix parsing of user modes (ignore everything after first space) (bug #36756) * irc: add option irc.look.ctcp_time_format to customize reply to CTCP TIME @@ -1,7 +1,7 @@ WeeChat Release Notes ===================== Sébastien Helleu <flashcode@flashtux.org> -v0.3.9-dev, 2012-07-05 +v0.3.9-dev, 2012-07-07 Version 0.3.9 (under dev!) @@ -9,10 +9,16 @@ Version 0.3.9 (under dev!) Important release notes: +* new bar item has been added: 'buffer_modes' and irc option + 'irc.look.item_channel_modes' has been removed; to display irc channel modes + in status bar (after channel name), you have to manually add the new item + 'buffer_modes' (this is now used by default in status bar items), default + value for status bar items becomes: +** `/set weechat.bar.status.items "[time],[buffer_count],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_filter,[lag],[hotlist],completion,scroll"` * changes in options for command `/aspell`: ** new option `enable`: enable aspell ** new option `disable`: disable aspell -** new option `toggle`: toggle aspell +** new option `toggle`: toggle aspell (new default key: alt+"s") ** option `enable` renamed to `setdict` (set dictionary for current buffer) ** option `disable` renamed to `deldict` (delete dictionary used on current buffer) ** option `dictlist` renamed to `listdict` (show installed dictionaries) @@ -52,8 +58,8 @@ Version 0.3.7 (2012-02-26) Important release notes: * option `scroll_unread` has been moved from command `/input` to `/window`, - therefore default command of key alt-u has been updated. To bind key with new - default value: + therefore default command of key alt+"u" has been updated. To bind key with + new default value: ** `/key bind meta-u /window scroll_unread` * extended regex is used in filters and irc ignore, so some chars that needed escape in past do not need any more (for example `[0-9]\+` becomes @@ -231,7 +237,7 @@ Important release notes: ** new keys for scrolling topic: F9/F10 ** key F10 was used for `infobar_clear` in previous WeeChat versions, you have to manually rebind this key (except for new WeeChat users): -*** `/key <press alt-k then F10> scroll_topic_right` (which gives something +*** `/key <press alt+"k" then F10> scroll_topic_right` (which gives something like: `/key meta2-21~ scroll_topic_right`). Version 0.2.1 (2006-10-01) @@ -274,12 +280,12 @@ Important release notes: '%h' is replaced by WeeChat home (default: '~/.weechat', may be overriden by new command line arg `--dir`). * after installing 0.1.8 (or with `/upgrade`), issue both commands (if you - didn't redefine these keys (alt-home/end): + didn't redefine these keys (alt+{home|end}): ** `/key unbind meta-meta2-1~` ** `/key unbind meta-meta2-4~` ** then launch again WeeChat (or issue `/upgrade`). -* Keys alt-home/end were used for nicklist scroll, they're now replaced by - alt-F11/F12. +* Keys alt+{home|end} were used for nicklist scroll, they're now replaced by + alt+{F11|F12}. Version 0.1.7 (2006-01-14) -------------------------- diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index bc77d8d26..e656588f4 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -188,13 +188,8 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `on`) -* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes* -** Beschreibung: `zeigt die Channel-Modi mittels "buffer_name" in der Bar-Item an` -** Typ: boolesch -** Werte: on, off (Standardwert: `on`) - * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key* -** Beschreibung: `unterdrückt Channel-Key falls die Modi in der Bar-Item mittels "buffer_name" dargestellt werden (diese Option unterdrückt alle Channel-Modi falls der Modus für den Channel auf +k gesetzt wurde)` +** Beschreibung: `hide channel key in channel modes (this will hide all channel modes arguments if mode +k is set on channel)` ** Typ: boolesch ** Werte: on, off (Standardwert: `off`) diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 2002bf61c..23630b1c8 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -405,7 +405,9 @@ Die 'status'-Bar besitzt als Standardeinträge: | 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 -| buffer_name | #test(+n) | Name des aktuellen Buffers (mit Channel-Modi für IRC-Channels) +| buffer_name | #test | Name des aktuellen Buffers +// TRANSLATION MISSING +| buffer_modes | +n | IRC channel modes | buffer_nicklist_count | {4} | 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) @@ -418,12 +420,12 @@ In der 'input' Bar lautet die Standardeinstellung: [width="100%",cols="^3,^6l,8",options="header"] |======================================== -| Item | Beispiel | Beschreibung -| input_paste | [Paste 7 lines ? [ctrl-Y] Ja [ctrl-N] Nein] | Nachfrage ob sieben Zeilen eingefügt werden sollen -| input_prompt | [@Flashy] | input prompt (Nickname für den IRC) -| away | (away) | Abwesenheitsanzeige -| input_search | [Text search] | Textsuche -| input_text | hi peter! | Text der eingegeben wird +| Item | Beispiel | Beschreibung +| input_paste | [Paste 7 lines ? [ctrl-Y] Ja [ctrl-N] Nein] | Nachfrage ob sieben Zeilen eingefügt werden sollen +| input_prompt | [@Flashy] | input prompt (Nickname für den IRC) +| away | (away) | Abwesenheitsanzeige +| input_search | [Text search] | Textsuche +| input_text | hi peter! | Text der eingegeben wird |======================================== // TRANSLATION MISSING @@ -971,23 +973,23 @@ Farbtabelle für @k(C-)@k(c) , @k(c): [width="50%",cols="^1m,3,3",options="header"] |======================================== -| Code | IRC | WeeChat (curses) -| 00 | weiß | white -| 01 | schwarz | black -| 02 | dunkelblau | blue -| 03 | dunkelgrün | green -| 04 | hellrot | lightred -| 05 | dunkelrot | red -| 06 | magenta | magenta -| 07 | orange | brown -| 08 | gelb | yellow -| 09 | hellgrün | lightgreen -| 10 | türkis | cyan -| 11 | hell türkis | lightcyan -| 12 | hellblau | lightblue -| 13 | hell magenta | lightmagenta -| 14 | grau | gray -| 15 | hellgrau | white +| Code | IRC | WeeChat (curses) +| 00 | weiß | white +| 01 | schwarz | black +| 02 | dunkelblau | blue +| 03 | dunkelgrün | green +| 04 | hellrot | lightred +| 05 | dunkelrot | red +| 06 | magenta | magenta +| 07 | orange | brown +| 08 | gelb | yellow +| 09 | hellgrün | lightgreen +| 10 | türkis | cyan +| 11 | hell türkis | lightcyan +| 12 | hellblau | lightblue +| 13 | hell magenta | lightmagenta +| 14 | grau | gray +| 15 | hellgrau | white |======================================== Beispiel: Im Buffer wird "Hallo an alle!" ausgegeben. Dabei wird "Hallo" in fett und hellblau @@ -1725,29 +1727,29 @@ mit dem entsprechenden Wert ersetzt: [width="100%",cols="^2l,4,8l",options="header"] |======================================== -| Platzhalter | Beschreibung | Wert/Beispiel -| $clientinfo | Liste der CTCP Antworten | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION -| $version | WeeChat Version | 0.3.0 -| $compilation | Datum der Kompilierung | Sep 13 2009 -| $osinfo | Info über das genutzte OS | Linux 2.6.31 / i686 -| $site | WeeChat Seite | http://www.weechat.org -| $download | WeeChat, download Seite | http://www.weechat.org/download -| $time | aktuelle Uhrzeit/Datum | Sun, 13 Sep 2009 15:48:31 +0200 -| $username | Username beim IRC Server | Nick -| $realname | Realname beim IRC Server | mein Name +| Platzhalter | Beschreibung | Wert/Beispiel +| $clientinfo | Liste der CTCP Antworten | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION +| $version | WeeChat Version | 0.3.0 +| $compilation | Datum der Kompilierung | Sep 13 2009 +| $osinfo | Info über das genutzte OS | Linux 2.6.31 / i686 +| $site | WeeChat Seite | http://www.weechat.org +| $download | WeeChat, download Seite | http://www.weechat.org/download +| $time | aktuelle Uhrzeit/Datum | Sun, 13 Sep 2009 15:48:31 +0200 +| $username | Username beim IRC Server | Nick +| $realname | Realname beim IRC Server | mein Name |======================================== Falls CTCP Optionen nicht festgelegt sind, lauten die CTCP Antworten: [width="100%",cols="^2,4l,8l",options="header"] |======================================== -| CTCP | Antwortformat | Beispiel -| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION -| FINGER | WeeChat $version | WeeChat 0.3.0 -| SOURCE | $download | http://www.weechat.org/download -| TIME | $time | Sun Sep 13 15:48:31 2009 -| USERINFO | $username ($realname) | Nick (mein Name) -| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) +| CTCP | Antwortformat | Beispiel +| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION +| FINGER | WeeChat $version | WeeChat 0.3.0 +| SOURCE | $download | http://www.weechat.org/download +| TIME | $time | Sun Sep 13 15:48:31 2009 +| USERINFO | $username ($realname) | Nick (mein Name) +| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) |======================================== [[irc_target_buffer]] diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 1094f255c..fbd3f2258 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -188,13 +188,8 @@ ** type: boolean ** values: on, off (default value: `on`) -* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes* -** description: `display channel modes in "buffer_name" bar item` -** type: boolean -** values: on, off (default value: `on`) - * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key* -** description: `hide channel key if modes are displayed in "buffer_name" bar item (this will hide all channel modes arguments if mode +k is set on channel)` +** description: `hide channel key in channel modes (this will hide all channel modes arguments if mode +k is set on channel)` ** type: boolean ** values: on, off (default value: `off`) diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index 648862c24..af0bdada8 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -406,7 +406,8 @@ Bar 'status' has following default items: | 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_name | #test | current buffer name +| buffer_modes | +n | IRC channel modes | buffer_nicklist_count | {4} | 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) @@ -419,12 +420,12 @@ Bar 'input' has following default items: [width="100%",cols="^3,^6l,8",options="header"] |======================================== -| Item | Example | Description -| input_paste | [Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No] | question to user for pasting lines -| input_prompt | [@Flashy] | input prompt (nick for irc plugin) -| away | (away) | away indicator -| input_search | [Text search] | text search indicator -| input_text | hi peter! | input text +| Item | Example | Description +| input_paste | [Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No] | question to user for pasting lines +| input_prompt | [@Flashy] | input prompt (nick for irc plugin) +| away | (away) | away indicator +| input_search | [Text search] | text search indicator +| input_text | hi peter! | input text |======================================== [[buffers_and_windows]] @@ -1703,13 +1704,13 @@ If CTCP options are not defined (by default), CTCP replies are: [width="100%",cols="^2,4l,8l",options="header"] |======================================== -| CTCP | Reply format | Example -| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION -| FINGER | WeeChat $version | WeeChat 0.3.0 -| SOURCE | $download | http://www.weechat.org/download -| TIME | $time | Sun Sep 13 15:48:31 2009 -| USERINFO | $username ($realname) | nick (My name) -| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) +| CTCP | Reply format | Example +| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION +| FINGER | WeeChat $version | WeeChat 0.3.0 +| SOURCE | $download | http://www.weechat.org/download +| TIME | $time | Sun Sep 13 15:48:31 2009 +| USERINFO | $username ($realname) | nick (My name) +| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) |======================================== [[irc_target_buffer]] diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index a39c45cc7..a0da01822 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -188,13 +188,8 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `on`) -* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes* -** description: `affiche les modes du canal dans l'objet de barre "buffer_name"` -** type: booléen -** valeurs: on, off (valeur par défaut: `on`) - * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key* -** description: `cacher la clé du canal si les modes sont affichés dans l'objet de barre "buffer_name" (cela cachera tous les paramètres des modes du canal si le mode +k est défini sur le canal)` +** description: `cacher la clé du canal (cela cachera tous les paramètres des modes du canal si le mode +k est défini sur le canal)` ** type: booléen ** valeurs: on, off (valeur par défaut: `off`) diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index ad8d05d59..c26e330a4 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -415,7 +415,8 @@ La barre 'status' contient les objets (items) suivants par défaut : | 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_name | #test | nom du tampon courant +| buffer_modes | +n | modes du canal IRC | buffer_nicklist_count | {4} | 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) @@ -428,12 +429,12 @@ La barre 'input' contient les objets (items) suivants par défaut : [width="100%",cols="^3,^6l,8",options="header"] |======================================== -| Objet (item) | Exemple | Description -| input_paste | [Coller 7 lignes ? [ctrl-Y] Oui [ctrl-N] Non] | question à l'utilisateur pour coller des lignes -| 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 | salut peter ! | texte entré +| Objet (item) | Exemple | Description +| input_paste | [Coller 7 lignes ? [ctrl-Y] Oui [ctrl-N] Non] | question à l'utilisateur pour coller des lignes +| 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 | salut peter ! | texte entré |======================================== [[buffers_and_windows]] @@ -1752,13 +1753,13 @@ Si les options CTCP ne sont pas définies (par défaut), les réponses CTCP sont [width="100%",cols="^2,4l,8l",options="header"] |======================================== -| CTCP | Format de réponse | Exemple -| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION -| FINGER | WeeChat $version | WeeChat 0.3.0 -| SOURCE | $download | http://www.weechat.org/download -| TIME | $time | Sun Sep 13 15:48:31 2009 -| USERINFO | $username ($realname) | pseudo (Mon nom) -| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) +| CTCP | Format de réponse | Exemple +| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION +| FINGER | WeeChat $version | WeeChat 0.3.0 +| SOURCE | $download | http://www.weechat.org/download +| TIME | $time | Sun Sep 13 15:48:31 2009 +| USERINFO | $username ($realname) | pseudo (Mon nom) +| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) |======================================== [[irc_target_buffer]] diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 3c6c7422c..3edd4a488 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -188,13 +188,8 @@ ** tipo: bool ** valori: on, off (valore predefinito: `on`) -* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes* -** descrizione: `visualizza le modalità canale nell'elemento barra "buffer_name"` -** tipo: bool -** valori: on, off (valore predefinito: `on`) - * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key* -** descrizione: `nasconde la chiave del canale se le modalità sono visualizzate nell'elemento barra "buffer_name" (in questo modo saranno nascosti tutti gli argomenti delle modalità del canale se la modalità +k è impostata sul canale)` +** descrizione: `hide channel key in channel modes (this will hide all channel modes arguments if mode +k is set on channel)` ** tipo: bool ** valori: on, off (valore predefinito: `off`) diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index 01ffc8da4..c8889f151 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -409,30 +409,32 @@ 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 | [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 -| buffer_name | #test(+n) | nome del buffer attivo (con le modalità canale per i canali irc) -| buffer_nicklist_count | {4} | 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 | [Att: 4:#abc(2,5), 6] | elenco dei buffer con attività (messaggi non letti) (nell'esempio, 2 eventi e 5 messaggi non letti su #abc, un messaggio non letto sul 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 +| 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 +| buffer_name | #test | nome del buffer attivo +// TRANSLATION MISSING +| buffer_modes | +n | IRC channel modes +| buffer_nicklist_count | {4} | 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 | [Att: 4:#abc(2,5), 6] | elenco dei buffer con attività (messaggi non letti) (nell'esempio, 2 eventi e 5 messaggi non letti su #abc, un messaggio non letto sul 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: [width="100%",cols="^3,^6l,8",options="header"] |======================================== -| Elemento | Esempio | Descrizione -| input_paste | [Incollare 7 righe ? [ctrl-Y] Sì [ctrl-N] No] | chiede all'utente se incollare le righe -| 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 | ciao peter! | testo in input +| Elemento | Esempio | Descrizione +| input_paste | [Incollare 7 righe ? [ctrl-Y] Sì [ctrl-N] No] | chiede all'utente se incollare le righe +| 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 | ciao peter! | testo in input |======================================== // TRANSLATION MISSING @@ -783,27 +785,27 @@ evento del mouse. [width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"] |======================================== -| Tasto | Azione | Zona | Descrizione | Comando -| ◾◽◽ | - | chat | Passa alla finestra | /window ${_window_number} -| ◾◽◽ | sinistra | chat | Passa al buffer precedente | /window ${_window_number};/buffer +1 -| ◾◽◽ | destra | chat | Passa al buffer successivo | /window ${_window_number};/buffer +1 -| ◾◽◽ | sinistra (lungo) | chat | Switch to first buffer | /window ${_window_number};/buffer 1 -| ◾◽◽ | destra (lungo) | chat | Passa all'ultimo buffer | /window ${_window_number};/input jump_last_buffer -| rotella ⇑ | - | chat | Scorre di qualche riga in alto nella cronologia del buffer | /window scroll_up -window ${_window_number} -| rotella ⇓ | - | chat | Scorre di qualche riga in basso nella cronologia del buffer | /window scroll_down -window ${_window_number} -| ◾◽◽ | su | lista nick | Scorre di una pagina in alto nella lista nick | /bar scroll nicklist ${_window_number} -100% -| ◾◽◽ | giù | lista nick | Scorre di una pagina in basso nella lista nick | /bar scroll nicklist ${_window_number} +100% -| ◾◽◽ | up (lungo) | lista nick | Sposta all'inizio della lista nick | /bar scroll nicklist ${_window_number} b -| ◾◽◽ | giù (lungo) | lista nick | Sposta alla fine della lista nick | /bar scroll nicklist ${_window_number} e -| ◾◽◽ | - | lista nick | Apre una query con un nick | /window ${_window_number};/query ${nick} -| ◽◽◾ | - | lista nick | Effettua un whois su un nick | /window ${_window_number};/whois ${nick} -| ◾◽◽ | sinistra | lista nick | Kick di un nick | /window ${_window_number};/kick ${nick} -| ◾◽◽ | sinistra (lungo) | lista nick | Kick e ban di un nick | /window ${_window_number};/kickban ${nick} -| ◽◽◾ | sinistra | lista nick | Ban di un nick | /window ${_window_number};/ban ${nick} -| ◽◽◾ | - | input | Cattura un evento del mouse e inserisce il codice nella riga di comando | /input grab_mouse_area -| rotella ⇑ | - | ogni barra | Scorre la barra del -10% | /bar scroll ${_bar_name} ${_window_number} -20% -| rotella ⇓ | - | ogni barra | Scorre la barra del +10% | /bar scroll ${_bar_name} ${_window_number} +20% -| ◽◾◽ | - | ovunque | Avvia la modalità cursore in questo punto | /cursor go ${_x},${_y} +| Tasto | Azione | Zona | Descrizione | Comando +| ◾◽◽ | - | chat | Passa alla finestra | /window ${_window_number} +| ◾◽◽ | sinistra | chat | Passa al buffer precedente | /window ${_window_number};/buffer +1 +| ◾◽◽ | destra | chat | Passa al buffer successivo | /window ${_window_number};/buffer +1 +| ◾◽◽ | sinistra (lungo) | chat | Switch to first buffer | /window ${_window_number};/buffer 1 +| ◾◽◽ | destra (lungo) | chat | Passa all'ultimo buffer | /window ${_window_number};/input jump_last_buffer +| rotella ⇑ | - | chat | Scorre di qualche riga in alto nella cronologia del buffer | /window scroll_up -window ${_window_number} +| rotella ⇓ | - | chat | Scorre di qualche riga in basso nella cronologia del buffer | /window scroll_down -window ${_window_number} +| ◾◽◽ | su | lista nick | Scorre di una pagina in alto nella lista nick | /bar scroll nicklist ${_window_number} -100% +| ◾◽◽ | giù | lista nick | Scorre di una pagina in basso nella lista nick | /bar scroll nicklist ${_window_number} +100% +| ◾◽◽ | up (lungo) | lista nick | Sposta all'inizio della lista nick | /bar scroll nicklist ${_window_number} b +| ◾◽◽ | giù (lungo) | lista nick | Sposta alla fine della lista nick | /bar scroll nicklist ${_window_number} e +| ◾◽◽ | - | lista nick | Apre una query con un nick | /window ${_window_number};/query ${nick} +| ◽◽◾ | - | lista nick | Effettua un whois su un nick | /window ${_window_number};/whois ${nick} +| ◾◽◽ | sinistra | lista nick | Kick di un nick | /window ${_window_number};/kick ${nick} +| ◾◽◽ | sinistra (lungo) | lista nick | Kick e ban di un nick | /window ${_window_number};/kickban ${nick} +| ◽◽◾ | sinistra | lista nick | Ban di un nick | /window ${_window_number};/ban ${nick} +| ◽◽◾ | - | input | Cattura un evento del mouse e inserisce il codice nella riga di comando | /input grab_mouse_area +| rotella ⇑ | - | ogni barra | Scorre la barra del -10% | /bar scroll ${_bar_name} ${_window_number} -20% +| rotella ⇓ | - | ogni barra | Scorre la barra del +10% | /bar scroll ${_bar_name} ${_window_number} +20% +| ◽◾◽ | - | ovunque | Avvia la modalità cursore in questo punto | /cursor go ${_x},${_y} |======================================== [[mouse]] @@ -1753,13 +1755,13 @@ le risposte CTCP sono: [width="100%",cols="^2,4l,8l",options="header"] |======================================= -| CTCP | Formato risposta | Esempio -| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION -| FINGER | WeeChat $version | WeeChat 0.3.0 -| SOURCE | $download | http://www.weechat.org/download -| TIME | $time | Sun Sep 13 15:48:31 2009 -| USERINFO | $username ($realname) | nick (Mio nome) -| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) +| CTCP | Formato risposta | Esempio +| CLIENTINFO | $clientinfo | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION +| FINGER | WeeChat $version | WeeChat 0.3.0 +| SOURCE | $download | http://www.weechat.org/download +| TIME | $time | Sun Sep 13 15:48:31 2009 +| USERINFO | $username ($realname) | nick (Mio nome) +| VERSION | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009) |======================================= [[irc_target_buffer]] @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5682,12 +5682,10 @@ msgstr "" msgid "display server away message in away bar item" msgstr "zobrazit zprávu nepřítomnosti na serveru v položce nepřítomnosti pole" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "zobrazit módy kanálu v položce pole \"buffer_name\"" - +#, fuzzy msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" "schovat klíč kanálu pokud jsou zobrazeny módy v \"buffer_name\" položce " "panelu (toto schová všechny argumenty módů kanálu pokud je +k nastaveno na " @@ -8420,6 +8418,9 @@ msgstr "" msgid "Constants" msgstr "" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "zobrazit módy kanálu v položce pole \"buffer_name\"" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sChyba: jméno nemůže začínat na \"#\"" @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-30 14:28+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -6117,12 +6117,10 @@ msgstr "" msgid "display server away message in away bar item" msgstr "Abwesenheitsnachricht in der Away-Bar-Item anzeigen" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "zeigt die Channel-Modi mittels \"buffer_name\" in der Bar-Item an" - +#, fuzzy msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" "unterdrückt Channel-Key falls die Modi in der Bar-Item mittels \"buffer_name" "\" dargestellt werden (diese Option unterdrückt alle Channel-Modi falls der " @@ -8978,6 +8976,9 @@ msgstr "Type" msgid "Constants" msgstr "Konstanten" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "zeigt die Channel-Modi mittels \"buffer_name\" in der Bar-Item an" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sFehler: Name darf nicht mit \"#\"beginnen" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5908,12 +5908,10 @@ msgstr "" msgid "display server away message in away bar item" msgstr "mostrar mensaje de ausencia en el elemento de barra \"away\"" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "mostrar los modos del canal en el elemento de barra \"buffer_name\"" - +#, fuzzy msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" "ocultar la clave del canal si los modos son mostrados en el elemento de " "barra \"buffer_name\" (esto ocultará todos los argumentos de los modos si +k " @@ -8705,6 +8703,9 @@ msgstr "Tipo" msgid "Constants" msgstr "Constantes" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "mostrar los modos del canal en el elemento de barra \"buffer_name\"" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sError: el nombre no puede empezar con \"#\"" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" -"PO-Revision-Date: 2012-07-05 15:55+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" +"PO-Revision-Date: 2012-07-07 11:26+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -5950,16 +5950,12 @@ msgid "display server away message in away bar item" msgstr "" "afficher le message d'absence du serveur dans l'objet de barre d'absence" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "affiche les modes du canal dans l'objet de barre \"buffer_name\"" - msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" -"cacher la clé du canal si les modes sont affichés dans l'objet de barre " -"\"buffer_name\" (cela cachera tous les paramètres des modes du canal si le " -"mode +k est défini sur le canal)" +"cacher la clé du canal (cela cachera tous les paramètres des modes du canal " +"si le mode +k est défini sur le canal)" msgid "display nick modes in \"input_prompt\" bar item" msgstr "affiche les modes du pseudo dans l'objet de barre \"input_prompt\"" @@ -8755,40 +8751,3 @@ msgstr "Type" msgid "Constants" msgstr "Constantes" - -#~ msgid "time format used in answer to message CTCP TIME" -#~ msgstr "format de l'heure utilisé dans la réponse au message CTCP TIME" - -#~ msgid "%sError: name can not start with \"#\"" -#~ msgstr "%sErreur: le nom ne peut pas commencer par \"#\"" - -#~ msgid "%s%s: name can not start with \"#\"" -#~ msgstr "%s%s: le nom ne peut pas commencer par \"#\"" - -#~ msgid "string inserted after nick completion" -#~ msgstr "chaîne affichée après la complétion des pseudos" - -#~ msgid "display '+' if prefix is truncated" -#~ msgstr "afficher '+' si le préfixe est tronqué" - -#~ msgid "<nick> <channel>" -#~ msgstr "<pseudo> <canal>" - -#~ msgid "" -#~ "delay (in seconds) to wait for control sequence ending a bracketed paste " -#~ "(\"ESC[201~\"); if the control sequence is not received and that delay is " -#~ "reached, WeeChat will end the bracketed paste" -#~ msgstr "" -#~ "délai (en secondes) à attendre pour la séquence de contrôle qui termine " -#~ "le mode \"bracketed paste\" (\"ESC[201~\"); si la séquence de contrôle " -#~ "n'est pas reçue et que ce délai est atteint, WeeChat terminera le " -#~ "\"bracketed paste\"" - -#~ msgid "" -#~ "enable bracketed paste mode (if available, only some terminals support it)" -#~ msgstr "" -#~ "activer le mode \"bracketed paste\" (si disponible, seulement quelques " -#~ "terminaux le supportent)" - -#~ msgid "mechanism for SASL authentication" -#~ msgstr "mécanisme pour l'authentification SASL" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5264,12 +5264,9 @@ msgstr "" msgid "display server away message in away bar item" msgstr "privát beszélgetésben a másik fél távollétét csak egyszer jelezze" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "" - msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" msgid "display nick modes in \"input_prompt\" bar item" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5890,12 +5890,10 @@ msgstr "" msgid "display server away message in away bar item" msgstr "mostra il messaggio di assenza del server nell'elemento barra di away" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "visualizza le modalità canale nell'elemento barra \"buffer_name\"" - +#, fuzzy msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" "nasconde la chiave del canale se le modalità sono visualizzate nell'elemento " "barra \"buffer_name\" (in questo modo saranno nascosti tutti gli argomenti " @@ -8679,6 +8677,9 @@ msgstr "Tipo" msgid "Constants" msgstr "Costanti" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "visualizza le modalità canale nell'elemento barra \"buffer_name\"" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sErrore: il nome non può iniziare con \"#\"" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/WeeChat>\n" @@ -5753,12 +5753,10 @@ msgstr "" msgid "display server away message in away bar item" msgstr "サーバの離席メッセージを離席バーアイテムに表示" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "\"buffer_name\" バーアイテムにチャンネルモードを表示" - +#, fuzzy msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" "\"buffer_name\" バーアイテムにモードが表示されていれば、チャンネルキーを隠す " "(チャンネルにモード +k が設定されていた場合、全てのチャンネルモード引数を隠" @@ -8473,6 +8471,9 @@ msgstr "タイプ" msgid "Constants" msgstr "定数" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "\"buffer_name\" バーアイテムにチャンネルモードを表示" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sエラー: \"#\" で始まる名前は使えません" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5869,12 +5869,10 @@ msgstr "pokaż prywatną wiadomość, kiedy użytkownik wróci na serwer" msgid "display server away message in away bar item" msgstr "wyświetla wiadomość o nieobecności dla serwera w elemencie paska" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "wyświetl atrybuty kanału w elemencie paska \"buffer_name\"" - +#, fuzzy msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" "ukrywa klucz kanału jeśli atrybuty są wyświetlane w elemencie paska " "\"buffer_name\" (ukryj to wszystkie atrybuty kanału jeśli na kanale " @@ -8612,6 +8610,9 @@ msgstr "Typ" msgid "Constants" msgstr "Stałe" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "wyświetl atrybuty kanału w elemencie paska \"buffer_name\"" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sBłąd: nazwa nie może się zaczynać od \"#\"" diff --git a/po/pt_BR.po b/po/pt_BR.po index b7140af4b..3e79e6ade 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5426,12 +5426,9 @@ msgstr "" msgid "display server away message in away bar item" msgstr "" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "exibir modos do canal no item da barra \"buffer_name\"" - msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" msgid "display nick modes in \"input_prompt\" bar item" @@ -8062,6 +8059,9 @@ msgstr "" msgid "Constants" msgstr "" +#~ msgid "display channel modes in \"buffer_name\" bar item" +#~ msgstr "exibir modos do canal no item da barra \"buffer_name\"" + #~ msgid "%sError: name can not start with \"#\"" #~ msgstr "%sErro: nome não pode começar com \"#\"" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5281,12 +5281,9 @@ msgstr "" msgid "display server away message in away bar item" msgstr "отображать уведомление об отсутствии единожды в привате" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "" - msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" msgid "display nick modes in \"input_prompt\" bar item" diff --git a/po/weechat.pot b/po/weechat.pot index 994249dda..811e18880 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: 2012-07-05 15:54+0200\n" +"POT-Creation-Date: 2012-07-06 12:13+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" @@ -4531,12 +4531,9 @@ msgstr "" msgid "display server away message in away bar item" msgstr "" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "" - msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" +"hide channel key in channel modes (this will hide all channel modes " +"arguments if mode +k is set on channel)" msgstr "" msgid "display nick modes in \"input_prompt\" bar item" diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 6cd68b4a7..2f05c5025 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -61,8 +61,8 @@ struct t_gui_bar_item *last_gui_bar_item = NULL; /* last bar item */ char *gui_bar_item_names[GUI_BAR_NUM_ITEMS] = { "input_paste", "input_prompt", "input_search", "input_text", "time", "buffer_count", "buffer_plugin", "buffer_number", "buffer_name", - "buffer_filter", "buffer_nicklist_count", "scroll", "hotlist", "completion", - "buffer_title", "buffer_nicklist", "window_number" + "buffer_modes", "buffer_filter", "buffer_nicklist_count", "scroll", + "hotlist", "completion", "buffer_title", "buffer_nicklist", "window_number" }; char *gui_bar_items_default_for_bars[][2] = { { GUI_BAR_DEFAULT_NAME_INPUT, @@ -71,8 +71,8 @@ char *gui_bar_items_default_for_bars[][2] = "buffer_title" }, { GUI_BAR_DEFAULT_NAME_STATUS, "[time],[buffer_count],[buffer_plugin],buffer_number+:+" - "buffer_name+{buffer_nicklist_count}+buffer_filter,[lag],[hotlist]," - "completion,scroll" }, + "buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_filter,[lag]," + "[hotlist],completion,scroll" }, { GUI_BAR_DEFAULT_NAME_NICKLIST, "buffer_nicklist" }, { NULL, @@ -920,6 +920,25 @@ gui_bar_item_default_buffer_name (void *data, struct t_gui_bar_item *item, } /* + * gui_bar_item_default_buffer_modes: default item for modes of buffer + * Note: this bar item is empty for WeeChat + * cote, this is used only by plugins like + * irc to display channel modes + */ + +char * +gui_bar_item_default_buffer_modes (void *data, struct t_gui_bar_item *item, + struct t_gui_window *window) +{ + /* make C compiler happy */ + (void) data; + (void) item; + (void) window; + + return NULL; +} + +/* * gui_bar_item_default_buffer_filter: default item for buffer filter */ @@ -1688,6 +1707,13 @@ gui_bar_item_init () gui_bar_item_hook_signal ("buffer_moved", gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NAME]); + /* buffer modes */ + gui_bar_item_new (NULL, + gui_bar_item_names[GUI_BAR_ITEM_BUFFER_MODES], + &gui_bar_item_default_buffer_modes, NULL); + gui_bar_item_hook_signal ("buffer_switch", + gui_bar_item_names[GUI_BAR_ITEM_BUFFER_MODES]); + /* buffer filter */ gui_bar_item_new (NULL, gui_bar_item_names[GUI_BAR_ITEM_BUFFER_FILTER], diff --git a/src/gui/gui-bar-item.h b/src/gui/gui-bar-item.h index 6feefcc29..2b7b92d6d 100644 --- a/src/gui/gui-bar-item.h +++ b/src/gui/gui-bar-item.h @@ -31,6 +31,7 @@ enum t_gui_bar_item_weechat GUI_BAR_ITEM_BUFFER_PLUGIN, GUI_BAR_ITEM_BUFFER_NUMBER, GUI_BAR_ITEM_BUFFER_NAME, + GUI_BAR_ITEM_BUFFER_MODES, GUI_BAR_ITEM_BUFFER_FILTER, GUI_BAR_ITEM_BUFFER_NICKLIST_COUNT, GUI_BAR_ITEM_SCROLL, diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c index 3c2490de5..48f647d63 100644 --- a/src/plugins/irc/irc-bar-item.c +++ b/src/plugins/irc/irc-bar-item.c @@ -192,8 +192,8 @@ char * irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item, struct t_gui_window *window) { - char buf[512], buf_name[256], modes[128], *modes_without_args; - const char *name, *pos_space, *pos_key; + char buf[512], buf_name[256], modes[128]; + const char *name; int part_from_channel, display_server; struct t_gui_buffer *buffer; struct t_irc_server *server; @@ -245,34 +245,6 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item, channel->name, (part_from_channel) ? IRC_COLOR_BAR_DELIM : "", (part_from_channel) ? ")" : ""); - if (!part_from_channel - && weechat_config_boolean (irc_config_look_item_channel_modes) - && channel->modes && channel->modes[0] - && (strcmp (channel->modes, "+") != 0)) - { - modes_without_args = NULL; - if (weechat_config_boolean (irc_config_look_item_channel_modes_hide_key)) - { - pos_space = strchr(channel->modes, ' '); - if (pos_space) - { - pos_key = strchr(channel->modes, 'k'); - if (pos_key && (pos_key < pos_space)) - { - modes_without_args = weechat_strndup(channel->modes, - pos_space - channel->modes); - } - } - } - snprintf (modes, sizeof (modes), - "%s(%s%s%s)", - IRC_COLOR_BAR_DELIM, - IRC_COLOR_ITEM_CHANNEL_MODES, - (modes_without_args) ? modes_without_args : channel->modes, - IRC_COLOR_BAR_DELIM); - if (modes_without_args) - free (modes_without_args); - } } } } @@ -294,6 +266,70 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item, } /* + * irc_bar_item_buffer_modes: bar item with buffer modes + */ + +char * +irc_bar_item_buffer_modes (void *data, struct t_gui_bar_item *item, + struct t_gui_window *window) +{ + char modes[128], *modes_without_args; + const char *pos_space, *pos_key; + int part_from_channel; + struct t_gui_buffer *buffer; + struct t_irc_server *server; + struct t_irc_channel *channel; + + /* make C compiler happy */ + (void) data; + (void) item; + + if (!window) + window = weechat_current_window (); + + modes[0] = '\0'; + + buffer = weechat_window_get_pointer (window, "buffer"); + if (!buffer) + return NULL; + + irc_buffer_get_server_and_channel (buffer, &server, &channel); + if (!channel) + return NULL; + + part_from_channel = ((channel->type == IRC_CHANNEL_TYPE_CHANNEL) + && !channel->nicks); + if (!part_from_channel + && channel->modes && channel->modes[0] + && (strcmp (channel->modes, "+") != 0)) + { + modes_without_args = NULL; + if (weechat_config_boolean (irc_config_look_item_channel_modes_hide_key)) + { + pos_space = strchr(channel->modes, ' '); + if (pos_space) + { + pos_key = strchr(channel->modes, 'k'); + if (pos_key && (pos_key < pos_space)) + { + modes_without_args = weechat_strndup (channel->modes, + pos_space - channel->modes); + } + } + } + snprintf (modes, sizeof (modes), + "%s%s", + IRC_COLOR_ITEM_CHANNEL_MODES, + (modes_without_args) ? modes_without_args : channel->modes); + if (modes_without_args) + free (modes_without_args); + return strdup (modes); + } + + return NULL; +} + +/* * irc_bar_item_channel: bar item with channel name (without modes) */ @@ -562,6 +598,7 @@ irc_bar_item_buffer_switch (void *data, const char *signal, weechat_bar_item_update ("away"); weechat_bar_item_update ("buffer_title"); weechat_bar_item_update ("buffer_name"); + weechat_bar_item_update ("buffer_modes"); weechat_bar_item_update ("irc_channel"); weechat_bar_item_update ("lag"); weechat_bar_item_update ("input_prompt"); @@ -580,6 +617,7 @@ irc_bar_item_init () weechat_bar_item_new ("buffer_title", &irc_bar_item_buffer_title, NULL); weechat_bar_item_new ("buffer_plugin", &irc_bar_item_buffer_plugin, NULL); weechat_bar_item_new ("buffer_name", &irc_bar_item_buffer_name, NULL); + weechat_bar_item_new ("buffer_modes", &irc_bar_item_buffer_modes, NULL); weechat_bar_item_new ("irc_channel", &irc_bar_item_channel, NULL); weechat_bar_item_new ("lag", &irc_bar_item_lag, NULL); weechat_bar_item_new ("input_prompt", &irc_bar_item_input_prompt, NULL); diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 4e695140f..046c21ee5 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -76,7 +76,6 @@ struct t_config_option *irc_config_look_display_old_topic; struct t_config_option *irc_config_look_display_pv_away_once; struct t_config_option *irc_config_look_display_pv_back; struct t_config_option *irc_config_look_item_away_message; -struct t_config_option *irc_config_look_item_channel_modes; struct t_config_option *irc_config_look_item_channel_modes_hide_key; struct t_config_option *irc_config_look_item_nick_modes; struct t_config_option *irc_config_look_item_nick_prefix; @@ -334,22 +333,6 @@ irc_config_change_look_item_away_message (void *data, } /* - * irc_config_change_look_item_channel_modes: called when the "display - * channel modes" option is changed - */ - -void -irc_config_change_look_item_channel_modes (void *data, - struct t_config_option *option) -{ - /* make C compiler happy */ - (void) data; - (void) option; - - weechat_bar_item_update ("buffer_name"); -} - -/* * irc_config_change_look_item_channel_modes_hide_key: called when the * "display channel modes * hide key" option is @@ -364,7 +347,7 @@ irc_config_change_look_item_channel_modes_hide_key (void *data, (void) data; (void) option; - weechat_bar_item_update ("buffer_name"); + weechat_bar_item_update ("buffer_modes"); } /* @@ -566,19 +549,19 @@ irc_config_change_color_item_away (void *data, } /* - * irc_config_change_color_item_buffer_name: called when the color of buffer - * name is changed + * irc_config_change_color_item_buffer_modes: called when the color of buffer + * modes is changed */ void -irc_config_change_color_item_buffer_name (void *data, - struct t_config_option *option) +irc_config_change_color_item_buffer_modes (void *data, + struct t_config_option *option) { /* make C compiler happy */ (void) data; (void) option; - weechat_bar_item_update ("buffer_name"); + weechat_bar_item_update ("buffer_modes"); } /* @@ -2181,18 +2164,11 @@ irc_config_init () N_("display server away message in away bar item"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, &irc_config_change_look_item_away_message, NULL, NULL, NULL); - irc_config_look_item_channel_modes = weechat_config_new_option ( - irc_config_file, ptr_section, - "item_channel_modes", "boolean", - N_("display channel modes in \"buffer_name\" bar item"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, - &irc_config_change_look_item_channel_modes, NULL, NULL, NULL); irc_config_look_item_channel_modes_hide_key = weechat_config_new_option ( irc_config_file, ptr_section, "item_channel_modes_hide_key", "boolean", - N_("hide channel key if modes are displayed in \"buffer_name\" bar " - "item (this will hide all channel modes arguments if mode +k is " - "set on channel)"), + N_("hide channel key in channel modes (this will hide all channel modes " + "arguments if mode +k is set on channel)"), NULL, 0, 0, "off", NULL, 0, NULL, NULL, &irc_config_change_look_item_channel_modes_hide_key, NULL, NULL, NULL); irc_config_look_item_nick_modes = weechat_config_new_option ( @@ -2428,7 +2404,7 @@ irc_config_init () "item_channel_modes", "color", N_("color for channel modes, near channel name"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, - &irc_config_change_color_item_buffer_name, NULL, NULL, NULL); + &irc_config_change_color_item_buffer_modes, NULL, NULL, NULL); irc_config_color_item_lag_counting = weechat_config_new_option ( irc_config_file, ptr_section, "item_lag_counting", "color", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 213ddb9c8..1d03a8b37 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -101,7 +101,6 @@ extern struct t_config_option *irc_config_look_display_old_topic; extern struct t_config_option *irc_config_look_display_pv_away_once; extern struct t_config_option *irc_config_look_display_pv_back; extern struct t_config_option *irc_config_look_item_away_message; -extern struct t_config_option *irc_config_look_item_channel_modes; extern struct t_config_option *irc_config_look_item_channel_modes_hide_key; extern struct t_config_option *irc_config_look_item_nick_modes; extern struct t_config_option *irc_config_look_item_nick_prefix; diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c index 29970ea3e..5e97fac77 100644 --- a/src/plugins/irc/irc-mode.c +++ b/src/plugins/irc/irc-mode.c @@ -396,7 +396,7 @@ irc_mode_channel_set (struct t_irc_server *server, weechat_string_free_split (argv); if (channel_modes_updated) - weechat_bar_item_update ("buffer_name"); + weechat_bar_item_update ("buffer_modes"); } /* |