diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | doc/de/autogen/user/buflist_commands.adoc | 59 | ||||
| -rw-r--r-- | doc/en/autogen/user/buflist_commands.adoc | 3 | ||||
| -rw-r--r-- | doc/fr/autogen/user/buflist_commands.adoc | 3 | ||||
| -rw-r--r-- | doc/it/autogen/user/buflist_commands.adoc | 3 | ||||
| -rw-r--r-- | doc/ja/autogen/user/buflist_commands.adoc | 59 | ||||
| -rw-r--r-- | doc/pl/autogen/user/buflist_commands.adoc | 59 | ||||
| -rw-r--r-- | po/cs.po | 7 | ||||
| -rw-r--r-- | po/de.po | 8 | ||||
| -rw-r--r-- | po/es.po | 7 | ||||
| -rw-r--r-- | po/fr.po | 15 | ||||
| -rw-r--r-- | po/hu.po | 7 | ||||
| -rw-r--r-- | po/it.po | 7 | ||||
| -rw-r--r-- | po/ja.po | 8 | ||||
| -rw-r--r-- | po/pl.po | 8 | ||||
| -rw-r--r-- | po/pt.po | 7 | ||||
| -rw-r--r-- | po/pt_BR.po | 7 | ||||
| -rw-r--r-- | po/ru.po | 7 | ||||
| -rw-r--r-- | po/tr.po | 7 | ||||
| -rw-r--r-- | po/weechat.pot | 7 | ||||
| -rw-r--r-- | src/plugins/buflist/buflist-bar-item.c | 6 | ||||
| -rw-r--r-- | src/plugins/buflist/buflist-command.c | 4 |
22 files changed, 180 insertions, 119 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index e59a08acc..df8776998 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -22,6 +22,7 @@ New features:: * api: add functions string_base_encode and string_base_decode, remove functions string_encode_base64 and string_decode_base64 * api: add support of Time-based One-Time Password (TOTP), add infos "totp_generate" and "totp_validate" + * buflist: add variable ${number2}, always set with the indented buffer number * relay: add support of Time-based One-Time Password (TOTP) as second authentication factor in weechat protocol Bug fixes:: diff --git a/doc/de/autogen/user/buflist_commands.adoc b/doc/de/autogen/user/buflist_commands.adoc index 7adf94307..d35d854a3 100644 --- a/doc/de/autogen/user/buflist_commands.adoc +++ b/doc/de/autogen/user/buflist_commands.adoc @@ -9,41 +9,42 @@ /buflist bar refresh - bar: fügt eine "buflist" Bar hinzu -refresh: erzwingt eine Aktualisierung des "buflist" Bar-Item + bar: add the "buflist" bar +refresh: force the refresh of the bar items (buflist, buflist2 and buflist3) -Jede Zeile die einen Buffer anzeigt wird mittels Zeichenketten-Evaluation dargestellt (siehe /help eval für das Format), dazu werden folgende Optionen genutzt: - - buflist.look.display_conditions: Bedingungen um einen Buffer in der Liste darzustellen - - buflist.format.buffer: Format für den Buffer, der nicht der aktuell dargestellte Buffer ist - - buflist.format.buffer_current: Format für den aktuell dargestellten Buffer +The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options: + - buflist.look.display_conditions: conditions to display a buffer in the list + - buflist.format.buffer: format for a buffer which is not current buffer + - buflist.format.buffer_current: format for the current buffer -Die folgenden Variablen können in den obigen Optionen genutzt werden: - - bar item data (siehe hdata "bar_item" in API Dokumentation für eine vollständige Liste), zum Beispiel: +The following variables can be used in these options: + - bar item data (see hdata "bar_item" in API doc for a complete list), for example: - ${bar_item.name} - - buffer data (siehe hdata "buffer" in API Dokumentation für eine vollständige Liste), zum Beispiel: + - buffer data (see hdata "buffer" in API doc for a complete list), for example: - ${buffer.number} - ${buffer.name} - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} - - irc_server: IRC Serverdaten, ausschließlich genutzt bei einem IRC Buffer (siehe hdata "irc_server" in API Dokumentation) - - irc_channel: IRC Channeldaten, ausschließlich genutzt bei einem IRC Channel Buffer (siehe hdata "irc_channel" in API Dokumentation) - - zusätzliche Variablen die durch buflist bereitgestellt werden: - - ${format_buffer}: der evaluierte Wert der Option buflist.format.buffer; dies kann in der Option buflist.format.buffer_current genutzt werden um zum Beispiel die Hintergrundfarbe zu verändern - - ${current_buffer}: ein Boolean ("0" oder "1"), "1" falls es sich um den aktuellen Buffer handelt; dies kann in einer Bedingung verwendet werden: ${if:${current_buffer}?...:...} - - ${merged}: ein Boolean ("0" oder "1"), "1" wenn der Buffer mit einem anderen zusammengefügt ist; kann innerhalb einer Bedingung genutzt werden: ${if:${merged}?...:...} - - ${format_number}: eingerückte Numer mit Trennzeichen (evaluiert aus Option buflist.format.number) - - ${number}: eingerückte Nummer, zum Beispiel " 1", falls die Anzahl der Buffer zwischen 10 und 99 liegt - - ${number_displayed}: "1" falls Nummer angezeigt wird, ansonsten "0" - - ${indent}: Einrückung für Name (Channel und private Buffer werden eingerückt) (evaluiert aus Option buflist.format.indent) - - ${format_nick_prefix}: Nick-Präfix mit entsprechender Farbe für einen Channel (evaluiert aus Option buflist.format.nick_prefix) - - ${color_nick_prefix}: Farbe für den Nick-Präfix von einem Channel (wird nur genutzt wenn die Option buflist.look.nick_prefix aktiviert ist) - - ${nick_prefix}: der Nick-Präfix für einen Channel (wird nur genutzt falls die Option buflist.look.nick_prefix aktiviert ist) - - ${format_name}: der formatierte Name (evaluiert aus Option buflist.format.name) - - ${name}: der Kurzname (falls einer gesetzt ist), Ersatzweise wird auf den Originalnamen zurückgegriffen - - ${color_hotlist}: die Farbe mit der höchsten Priorität für den entsprechenden Buffer (evaluiert aus Option buflist.format.hotlist_xxx wobei xxx der entsprechende Level ist) - - ${format_hotlist}: die formatierte Hotlist (evaluiert aus Option buflist.format.hotlist) - - ${hotlist}: die Hotlist in der Rohform - - ${hotlist_priority}: "none", "low", "message", "private" oder "highlight" - - ${format_lag}: die Verzögerung für einen IRC Server-Buffer, ist leer falls es keine Verzögerung gibt (evaluiert aus Option buflist.format.lag) + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) + - extra variables added by buflist for convenience: + - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example + - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...} + - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...} + - ${format_number}: indented number with separator (evaluation of option buflist.format.number) + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers; for merged buffers, this variable is set with number for the first buffer and spaces for the next buffers with same number + - ${number2}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${number_displayed}: "1" if the number is displayed, otherwise "0" + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${format_name}: formatted name (evaluation of option buflist.format.name) + - ${name}: the short name (if set), with a fallback on the name + - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) + - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist) + - ${hotlist}: the raw hotlist + - ${hotlist_priority}: "none", "low", "message", "private" or "highlight" + - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag) ---- diff --git a/doc/en/autogen/user/buflist_commands.adoc b/doc/en/autogen/user/buflist_commands.adoc index d53477ff8..effe55abe 100644 --- a/doc/en/autogen/user/buflist_commands.adoc +++ b/doc/en/autogen/user/buflist_commands.adoc @@ -33,7 +33,8 @@ The following variables can be used in these options: - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...} - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...} - ${format_number}: indented number with separator (evaluation of option buflist.format.number) - - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers; for merged buffers, this variable is set with number for the first buffer and spaces for the next buffers with same number + - ${number2}: indented number, for example " 1" if there are between 10 and 99 buffers - ${number_displayed}: "1" if the number is displayed, otherwise "0" - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) diff --git a/doc/fr/autogen/user/buflist_commands.adoc b/doc/fr/autogen/user/buflist_commands.adoc index c69fdbede..3821fad45 100644 --- a/doc/fr/autogen/user/buflist_commands.adoc +++ b/doc/fr/autogen/user/buflist_commands.adoc @@ -33,7 +33,8 @@ Les variables suivantes peuvent être utilisées dans ces options : - ${current_buffer} : un booléen ("0" ou "1"), "1" s'il s'agit du tampon courant ; cela peut être utilisé dans une condition : ${if:${current_buffer}?...:...} - ${merged} : un booléen ("0" ou "1"), "1" si le tampon est mélangé avec au moins un autre tampon ; cela peut être utilisé dans une condition : ${if:${merged}?...:...} - ${format_number} : numéro indenté avec un séparateur (évaluation de l'option buflist.format.number) - - ${number} : numéro indenté, par exemple " 1" s'il y a entre 10 et 99 tampons + - ${number} : numéro indenté, par exemple " 1" s'il y a entre 10 et 99 tampons ; pour les tampons mélangés, cette variable est définie avec le numéro pour le premier tampon et des espaces pour les tampons suivants avec le même numéro + - ${number2} : numéro indenté, par exemple " 1" s'il y a entre 10 et 99 tampons - ${number_displayed} : "1" si le numéro est affiché, sinon "0" - ${indent} : indentation pour le nom (les tampons de canaux ou privés sont indentés) (évaluation de l'option buflist.format.indent) - ${format_nick_prefix} : le préfixe du pseudo en couleur pour un canal (évaluation de l'option buflist.format.nick_prefix) diff --git a/doc/it/autogen/user/buflist_commands.adoc b/doc/it/autogen/user/buflist_commands.adoc index d53477ff8..effe55abe 100644 --- a/doc/it/autogen/user/buflist_commands.adoc +++ b/doc/it/autogen/user/buflist_commands.adoc @@ -33,7 +33,8 @@ The following variables can be used in these options: - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...} - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...} - ${format_number}: indented number with separator (evaluation of option buflist.format.number) - - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers; for merged buffers, this variable is set with number for the first buffer and spaces for the next buffers with same number + - ${number2}: indented number, for example " 1" if there are between 10 and 99 buffers - ${number_displayed}: "1" if the number is displayed, otherwise "0" - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) diff --git a/doc/ja/autogen/user/buflist_commands.adoc b/doc/ja/autogen/user/buflist_commands.adoc index 0cadd5e90..c1fc71b26 100644 --- a/doc/ja/autogen/user/buflist_commands.adoc +++ b/doc/ja/autogen/user/buflist_commands.adoc @@ -9,41 +9,42 @@ /buflist bar refresh - bar: "buflist" バーを追加します -refresh: 強制的にバー要素 (buflist、buflist2、buflist3) の内容を最新の状態に更新します + bar: add the "buflist" bar +refresh: force the refresh of the bar items (buflist, buflist2 and buflist3) -各バッファエントリは文字列評価 (書式は /help eval を参照してください) を使って表示されます、以下のオプションで指定します: - - buflist.look.display_conditions: バッファをリスト内に表示する条件 - - buflist.format.buffer: 現在のバッファ以外のバッファを表示する書式 - - buflist.format.buffer_current: 現在のバッファを表示する書式 +The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options: + - buflist.look.display_conditions: conditions to display a buffer in the list + - buflist.format.buffer: format for a buffer which is not current buffer + - buflist.format.buffer_current: format for the current buffer -以下は上記オプションで使用可能な変数です: - - バー要素データ (完全なリストは API リファレンスの hdata "bar_item" を参照してください)、例: +The following variables can be used in these options: + - bar item data (see hdata "bar_item" in API doc for a complete list), for example: - ${bar_item.name} - - バッファデータ (完全なリストは API リファレンスの hdata "buffer" を参照してください)、例: + - buffer data (see hdata "buffer" in API doc for a complete list), for example: - ${buffer.number} - ${buffer.name} - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} - - irc_server: IRC サーバデータ、IRC バッファのみで定義 (API リファレンスの hdata "irc_server" を参照してください) - - irc_channel: IRC チャンネルデータ、IRC チャンネルバッファのみで定義 (API リファレンスの hdata "irc_channel" を参照してください) - - buflist プラグインが利便性向上の目的で追加した変数: - - ${format_buffer}: buflist.format.buffer オプションの評価結果; 例えば単に背景色を変えるなどの目的で、この変数を buflist.format.buffer_current オプションの中で使うことも可能です。 - - ${current_buffer}: ブール値 ("0" または "1")、対象のバッファが現在のバッファの場合に "1"; 次のように条件中で使うことができます: ${if:${current_buffer}?...:...} - - ${merged}: ブール値 ("0" または "1")、対象のバッファが他のバッファとマージされていた場合に "1"; 次のように条件中で使うことができます: ${if:${merged}?...:...} - - ${format_number}: 区切り文字を付けたインデント済み番号 (buflist.format.number オプションの評価結果) - - ${number}: インデント済み番号、例えば 10 から 99 番のバッファがある場合に " 1" - - ${number_displayed}: 番号が表示される場合に "1"、それ以外の場合に "0" - - ${indent}: 名前用のインデント (チャンネルとプライベートバッファがインデントされます) - - ${format_nick_prefix}: チャンネルにおける色付きニックネームプレフィックス (buflist.format.nick_prefix オプションの評価結果) - - ${color_nick_prefix}: チャンネルにおけるニックネームプレフィックスの色 (buflist.look.nick_prefix オプションが有効化された場合のみ設定されます) - - ${nick_prefix}: チャンネルにおけるニックネームプレフィックス (buflist.look.nick_prefix オプションが有効化された場合のみ設定されます) - - ${format_name}: 書式化済みのニックネーム (buflist.format.name オプションを評価した後の値) - - ${name}: 短縮名 (設定済みの場合)、未設定の場合には名前 - - ${color_hotlist}: 対象バッファのホットリストレベルの最大値に対応する色 (buflist.format.hotlist_xxx オプションの評価結果、xxx がレベル) - - ${format_hotlist}: 評価後のホットリスト (buflist.format.hotlist オプションの評価結果) - - ${hotlist}: 評価前のホットリスト - - ${hotlist_priority}: "none"、"low"、"message"、"private"、"highlight" - - ${format_lag}: IRC サーババッファの遅延時間、遅延がない場合は空 (buflist.format.lag オプションの評価結果) + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) + - extra variables added by buflist for convenience: + - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example + - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...} + - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...} + - ${format_number}: indented number with separator (evaluation of option buflist.format.number) + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers; for merged buffers, this variable is set with number for the first buffer and spaces for the next buffers with same number + - ${number2}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${number_displayed}: "1" if the number is displayed, otherwise "0" + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${format_name}: formatted name (evaluation of option buflist.format.name) + - ${name}: the short name (if set), with a fallback on the name + - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) + - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist) + - ${hotlist}: the raw hotlist + - ${hotlist_priority}: "none", "low", "message", "private" or "highlight" + - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag) ---- diff --git a/doc/pl/autogen/user/buflist_commands.adoc b/doc/pl/autogen/user/buflist_commands.adoc index 95383bb4a..a15b14437 100644 --- a/doc/pl/autogen/user/buflist_commands.adoc +++ b/doc/pl/autogen/user/buflist_commands.adoc @@ -9,41 +9,42 @@ /buflist bar refresh - bar: dodaje pasek "buflist" -refresh: wymusza odświeżenie elementu paska "buflist" + bar: add the "buflist" bar +refresh: force the refresh of the bar items (buflist, buflist2 and buflist3) -Linie z buforami są wyświetlane za pomocą przetwarzania ciągów (zobacz /help eval żeby poznać format), za pomocą tych opcji: - - buflist.look.display_conditions: warunki wyświetlnia buforu na liście - - buflist.format.buffer: format dla buforu nie będącego obecnym buforem - - buflist.format.buffer_current: format format dla obecnego buforu +The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options: + - buflist.look.display_conditions: conditions to display a buffer in the list + - buflist.format.buffer: format for a buffer which is not current buffer + - buflist.format.buffer_current: format for the current buffer -Następujące zmienne mogą być użyte w powyższych opcjach: - - dane elementu paska (pełną listę można znaleźć w dokumentacji API dla hdata "bar_item"), na przykład: +The following variables can be used in these options: + - bar item data (see hdata "bar_item" in API doc for a complete list), for example: - ${bar_item.name} - - dane buforu (zobacz hdata "buffer" w dokumentacji API dla pełnej listy zmiennych), na przykład: + - buffer data (see hdata "buffer" in API doc for a complete list), for example: - ${buffer.number} - ${buffer.name} - ${buffer.full_name} - ${buffer.short_name} - ${buffer.nicklist_nicks_count} - - irc_server: dane serwera IRC, zdefiniowane tylko w buforze IRC (zobacz hdata "irc_server" w dokumentacji API) - - irc_channel: dane kanału IRC, zdefiniowane tylko w buforze kanału IRC (zobacz hdata "irc_channel" w dokumentacji API) - - dodatkowe zmienne dodane dla wygody przez listę buforów: - - ${format_buffer}: przetworzona watość opcji buflist.format.buffer; może to zostać użyte w opcji buflist.format.buffer_current na przykład do zmiany koloru tła - - ${current_buffer}: boolowskie ("0" lub "1"), "1" jeśli jest to obecny bufor; może zostać użyte w warunku: ${if: ${current_buffer}?...:...} - - ${merged}: boolowskie ("0" lub "1"), "1" jeśli bufor jest połączony z przynajmniej jednym innym buforem; może zostać użyte w warunku: ${if:${merged}?...:...} - - ${format_number}: wyrównany numer z separatorem (przetworzona opcja buflist.format.number) - - ${number}: wyrównany numer, na przykład " 1" jeśli buforów jest między 10 a 99 - - ${number_displayed}: "1" jeśłi numer jest wyświetlany, w przeciwnym wypadku "0" - - ${indent}: wyrównanie dla nazwy (kanały i bufory prywatne są wyrównywane) (przetworzona opcja buflist.format.indent) - - ${format_nick_prefix}: kolorowy prefiks nicka dla kanału (przetworzona opcja buflist.format.nick_prefix) - - ${color_nick_prefix}: kolor prefiksu nicka dla kanału (ustawiany, jeśli opcja buflist.look.nick_prefix jest włączona) - - ${nick_prefix}: prefix nicka dla kanału (ustawiany, jeśli opcja buflist.look.nick_prefix jest włączona) - - ${format_name}: zformatowana nazwa (przetworzona opcja buflist.format.name) - - ${name}: skrócona nazwa (jeśli ustawiona inaczej zwraca pełną nazwę) - - ${color_hotlist}: kolor zależący od najwyższego poziomu hotlity dla bufora (przetworzona opcja buflist.format.hotlist_xxx, gdziexxx to poziom) - - ${format_hotlist}: zformatowana hotlista (przetworzenie opcji buflist.format.hotlist) - - ${hotlist}: niesformatowana hotlista - - ${hotlist_priority}: "none", "low", "message", "private" lub "highlight" - - ${format_lag}: opóźnienie buforu serwera IRC, puste jeśli nie ma opóźnienia (przetworzona opcja buflist.format.lag) + - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc) + - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc) + - extra variables added by buflist for convenience: + - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example + - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...} + - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...} + - ${format_number}: indented number with separator (evaluation of option buflist.format.number) + - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers; for merged buffers, this variable is set with number for the first buffer and spaces for the next buffers with same number + - ${number2}: indented number, for example " 1" if there are between 10 and 99 buffers + - ${number_displayed}: "1" if the number is displayed, otherwise "0" + - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent) + - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix) + - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled) + - ${format_name}: formatted name (evaluation of option buflist.format.name) + - ${name}: the short name (if set), with a fallback on the name + - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level) + - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist) + - ${hotlist}: the raw hotlist + - ${hotlist_priority}: "none", "low", "message", "private" or "highlight" + - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag) ---- @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5043,7 +5043,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-10-14 20:47+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -5953,6 +5953,7 @@ msgstr "" msgid "bar item with list of buffers" msgstr "Bar-Item mit der Liste von Buffern" +#, fuzzy msgid "" " bar: add the \"buflist\" bar\n" "refresh: force the refresh of the bar items (buflist, buflist2 and " @@ -5993,7 +5994,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5257,7 +5257,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" -"PO-Revision-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" +"PO-Revision-Date: 2018-11-05 22:18+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -5847,7 +5847,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -5913,7 +5916,11 @@ msgstr "" " - ${format_number} : numéro indenté avec un séparateur (évaluation de " "l'option buflist.format.number)\n" " - ${number} : numéro indenté, par exemple \" 1\" s'il y a entre 10 et 99 " -"tampons\n" +"tampons ; pour les tampons mélangés, cette variable est définie avec le " +"numéro pour le premier tampon et des espaces pour les tampons suivants avec " +"le même numéro\n" +" - ${number2} : numéro indenté, par exemple \" 1\" s'il y a entre 10 et " +"99 tampons\n" " - ${number_displayed} : \"1\" si le numéro est affiché, sinon \"0\"\n" " - ${indent} : indentation pour le nom (les tampons de canaux ou privés " "sont indentés) (évaluation de l'option buflist.format.indent)\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4576,7 +4576,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5395,7 +5395,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -5545,6 +5545,7 @@ msgstr "" msgid "bar item with list of buffers" msgstr "バッファのリストを表示するバー要素" +#, fuzzy msgid "" " bar: add the \"buflist\" bar\n" "refresh: force the refresh of the bar items (buflist, buflist2 and " @@ -5585,7 +5586,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -5677,6 +5677,7 @@ msgstr "" msgid "bar item with list of buffers" msgstr "element paska z listą buforów" +#, fuzzy msgid "" " bar: add the \"buflist\" bar\n" "refresh: force the refresh of the bar items (buflist, buflist2 and " @@ -5717,7 +5718,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -5661,7 +5661,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " diff --git a/po/pt_BR.po b/po/pt_BR.po index 938783263..b843419a5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5197,7 +5197,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4614,7 +4614,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2018-11-04 21:44+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4181,7 +4181,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " diff --git a/po/weechat.pot b/po/weechat.pot index 35dbb56d9..acdd07d0a 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-11-04 21:47+0100\n" +"POT-Creation-Date: 2018-11-05 22:16+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4164,7 +4164,10 @@ msgid "" " - ${format_number}: indented number with separator (evaluation of option " "buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there are between 10 " -"and 99 buffers\n" +"and 99 buffers; for merged buffers, this variable is set with number for the " +"first buffer and spaces for the next buffers with same number\n" +" - ${number2}: indented number, for example \" 1\" if there are between " +"10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, otherwise " "\"0\"\n" " - ${indent}: indentation for name (channel and private buffers are " diff --git a/src/plugins/buflist/buflist-bar-item.c b/src/plugins/buflist/buflist-bar-item.c index b649c7cbb..00cef4356 100644 --- a/src/plugins/buflist/buflist-bar-item.c +++ b/src/plugins/buflist/buflist-bar-item.c @@ -276,7 +276,7 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, char **buflist, *str_buflist, *condition; char str_format_number[32], str_format_number_empty[32]; char str_nick_prefix[32], str_color_nick_prefix[32]; - char str_number[32], *line, **hotlist, *str_hotlist; + char str_number[32], str_number2[32], *line, **hotlist, *str_hotlist; char str_hotlist_count[32]; const char *ptr_format, *ptr_format_current, *ptr_format_indent; const char *ptr_name, *ptr_type, *ptr_nick, *ptr_nick_prefix; @@ -408,6 +408,8 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, weechat_hashtable_set (buflist_hashtable_extra_vars, "number_displayed", "0"); } + snprintf (str_number2, sizeof (str_number2), + str_format_number, number); prev_number = number; /* buffer merged */ @@ -491,6 +493,8 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data, weechat_hashtable_set (buflist_hashtable_extra_vars, "number", str_number); weechat_hashtable_set (buflist_hashtable_extra_vars, + "number2", str_number2); + weechat_hashtable_set (buflist_hashtable_extra_vars, "format_number", weechat_config_string ( buflist_config_format_number)); diff --git a/src/plugins/buflist/buflist-command.c b/src/plugins/buflist/buflist-command.c index 203d567fc..2af902442 100644 --- a/src/plugins/buflist/buflist-command.c +++ b/src/plugins/buflist/buflist-command.c @@ -112,6 +112,10 @@ buflist_command_init () " - ${format_number}: indented number with separator " "(evaluation of option buflist.format.number)\n" " - ${number}: indented number, for example \" 1\" if there " + "are between 10 and 99 buffers; for merged buffers, this variable " + "is set with number for the first buffer and spaces for the next " + "buffers with same number\n" + " - ${number2}: indented number, for example \" 1\" if there " "are between 10 and 99 buffers\n" " - ${number_displayed}: \"1\" if the number is displayed, " "otherwise \"0\"\n" |