summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/de/autogen/user/buflist_commands.adoc53
-rw-r--r--doc/en/autogen/user/buflist_commands.adoc1
-rw-r--r--doc/fr/autogen/user/buflist_commands.adoc1
-rw-r--r--doc/it/autogen/user/buflist_commands.adoc1
-rw-r--r--doc/ja/autogen/user/buflist_commands.adoc53
-rw-r--r--doc/pl/autogen/user/buflist_commands.adoc1
-rw-r--r--po/cs.po5
-rw-r--r--po/de.po6
-rw-r--r--po/es.po5
-rw-r--r--po/fr.po10
-rw-r--r--po/hu.po5
-rw-r--r--po/it.po5
-rw-r--r--po/ja.po6
-rw-r--r--po/pl.po5
-rw-r--r--po/pt.po5
-rw-r--r--po/pt_BR.po5
-rw-r--r--po/ru.po5
-rw-r--r--po/tr.po5
-rw-r--r--po/weechat.pot5
-rw-r--r--src/plugins/buflist/buflist-command.c3
20 files changed, 119 insertions, 66 deletions
diff --git a/doc/de/autogen/user/buflist_commands.adoc b/doc/de/autogen/user/buflist_commands.adoc
index 0d769c523..cd4c7d5e6 100644
--- a/doc/de/autogen/user/buflist_commands.adoc
+++ b/doc/de/autogen/user/buflist_commands.adoc
@@ -9,37 +9,38 @@
/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 "buflist" bar item
-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:
- - buffer data (siehe hdata "buffer" in API Dokumentation für eine vollständige Liste), zum Beispiel:
+The following variables can be used in these options:
+ - 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}?...:...}
- - ${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)
- - ${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
+ - ${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)
+ - ${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 ccd38f9b8..277fcc063 100644
--- a/doc/en/autogen/user/buflist_commands.adoc
+++ b/doc/en/autogen/user/buflist_commands.adoc
@@ -29,6 +29,7 @@ The following variables can be used in these options:
- 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
- ${number_displayed}: "1" if the number is displayed, otherwise "0"
diff --git a/doc/fr/autogen/user/buflist_commands.adoc b/doc/fr/autogen/user/buflist_commands.adoc
index ba939fa02..9d4900395 100644
--- a/doc/fr/autogen/user/buflist_commands.adoc
+++ b/doc/fr/autogen/user/buflist_commands.adoc
@@ -29,6 +29,7 @@ Les variables suivantes peuvent être utilisées dans ces options :
- variables additionnelles ajoutées par buflist pour des raisons pratiques :
- ${format_buffer} : la valeur évaluée de l'option buflist.format.buffer ; peut être utilisée dans l'option buflist.format.buffer_current pour juste changer la couleur de fond par exemple
- ${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_displayed} : "1" si le numéro est affiché, sinon "0"
diff --git a/doc/it/autogen/user/buflist_commands.adoc b/doc/it/autogen/user/buflist_commands.adoc
index ccd38f9b8..277fcc063 100644
--- a/doc/it/autogen/user/buflist_commands.adoc
+++ b/doc/it/autogen/user/buflist_commands.adoc
@@ -29,6 +29,7 @@ The following variables can be used in these options:
- 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
- ${number_displayed}: "1" if the number is displayed, otherwise "0"
diff --git a/doc/ja/autogen/user/buflist_commands.adoc b/doc/ja/autogen/user/buflist_commands.adoc
index bced8b857..b272c5f1f 100644
--- a/doc/ja/autogen/user/buflist_commands.adoc
+++ b/doc/ja/autogen/user/buflist_commands.adoc
@@ -9,37 +9,38 @@
/buflist bar
refresh
- bar: "buflist" バーを追加します
-refresh: 強制的に "buflist" バー要素の内容を最新の状態に更新します
+ bar: add the "buflist" bar
+refresh: force the refresh of the "buflist" bar item
-各バッファエントリは文字列評価 (書式は /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 "buffer" を参照してください)、例:
+The following variables can be used in these options:
+ - 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}?...:...}
- - ${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 オプションが有効化された場合のみ設定されます)
- - ${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
+ - ${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)
+ - ${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 de582424f..82505e76b 100644
--- a/doc/pl/autogen/user/buflist_commands.adoc
+++ b/doc/pl/autogen/user/buflist_commands.adoc
@@ -29,6 +29,7 @@ The following variables can be used in these options:
- 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
- ${number_displayed}: "1" if the number is displayed, otherwise "0"
diff --git a/po/cs.po b/po/cs.po
index 10d805031..989bbf2f5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-05-13 22:06+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4946,6 +4946,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/de.po b/po/de.po
index 56faa7565..70aa02902 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-06-09 22:32+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -5812,6 +5812,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 \"buflist\" bar item\n"
@@ -5842,6 +5843,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/es.po b/po/es.po
index 56a7a7aec..963eef1eb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-01-06 22:01+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5160,6 +5160,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/fr.po b/po/fr.po
index cf8d2a4bc..e5dbeb561 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
-"PO-Revision-Date: 2017-06-12 20:01+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
+"PO-Revision-Date: 2017-06-13 21:17+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -5712,6 +5712,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
@@ -5769,6 +5772,9 @@ msgstr ""
" - ${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}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${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 "
diff --git a/po/hu.po b/po/hu.po
index 8fe2b97fe..f513d85f2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-01-06 22:03+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4484,6 +4484,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/it.po b/po/it.po
index 84d971aa8..2d0cf38b8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-01-06 22:04+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5298,6 +5298,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/ja.po b/po/ja.po
index b5d6a803b..301864ec8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-06-10 09:00+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -5417,6 +5417,7 @@ msgstr ""
msgid "bar item with list of buffers"
msgstr "バッファのリストを表示するバー要素"
+#, fuzzy
msgid ""
" bar: add the \"buflist\" bar\n"
"refresh: force the refresh of the \"buflist\" bar item\n"
@@ -5447,6 +5448,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/pl.po b/po/pl.po
index 0a3f72840..e0203d5a9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-04-08 14:49+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5578,6 +5578,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/pt.po b/po/pt.po
index a33ff172c..181c1f256 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-04-08 14:50+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -5554,6 +5554,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 732b13182..f3275bc9b 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: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2016-09-03 08:24+0200\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5100,6 +5100,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/ru.po b/po/ru.po
index d873444bf..6d616c768 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-01-06 22:06+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4522,6 +4522,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/tr.po b/po/tr.po
index 9c0618792..43a5dbc7e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2017-01-06 22:07+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4087,6 +4087,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/po/weechat.pot b/po/weechat.pot
index 170e4116f..4b52d59b5 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: 2017-06-12 19:59+0200\n"
+"POT-Creation-Date: 2017-06-13 21:16+0200\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4072,6 +4072,9 @@ msgid ""
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
"current buffer; it can be used in a condition: ${if:"
"${current_buffer}?...:...}\n"
+" - ${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}?...:...}\n"
" - ${format_number}: indented number with separator (evaluation of option "
"buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there are between 10 "
diff --git a/src/plugins/buflist/buflist-command.c b/src/plugins/buflist/buflist-command.c
index adf4a1ba2..9ee8a59e3 100644
--- a/src/plugins/buflist/buflist-command.c
+++ b/src/plugins/buflist/buflist-command.c
@@ -102,6 +102,9 @@ buflist_command_init ()
" - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if "
"this is the current buffer; it can be used in a condition: "
"${if:${current_buffer}?...:...}\n"
+ " - ${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}?...:...}\n"
" - ${format_number}: indented number with separator "
"(evaluation of option buflist.format.number)\n"
" - ${number}: indented number, for example \" 1\" if there "