diff --git a/doc/de/autogen/user/fset_commands.adoc b/doc/de/autogen/user/fset_commands.adoc index 7733cc3b1..3fde1857b 100644 --- a/doc/de/autogen/user/fset_commands.adoc +++ b/doc/de/autogen/user/fset_commands.adoc @@ -56,9 +56,8 @@ c:xxx show only options matching the evaluated condition "xxx", using following variables: file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values The lines with options are displayed using string evaluation (see /help eval for the format), with these options: - - fset.format.option{1,2}: formats for an option which is not marked nor the selected line - - fset.format.option_marked{1,2}: formats for a marked option - - fset.format.option_selected{1,2}: formats for the selected option + - fset.format.option1: first format for an option + - fset.format.option2: second format for an option The following variables can be used in these options: - option data, with color and padded by spaces on the right: diff --git a/doc/en/autogen/user/fset_commands.adoc b/doc/en/autogen/user/fset_commands.adoc index 7733cc3b1..3fde1857b 100644 --- a/doc/en/autogen/user/fset_commands.adoc +++ b/doc/en/autogen/user/fset_commands.adoc @@ -56,9 +56,8 @@ c:xxx show only options matching the evaluated condition "xxx", using following variables: file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values The lines with options are displayed using string evaluation (see /help eval for the format), with these options: - - fset.format.option{1,2}: formats for an option which is not marked nor the selected line - - fset.format.option_marked{1,2}: formats for a marked option - - fset.format.option_selected{1,2}: formats for the selected option + - fset.format.option1: first format for an option + - fset.format.option2: second format for an option The following variables can be used in these options: - option data, with color and padded by spaces on the right: diff --git a/doc/fr/autogen/user/fset_commands.adoc b/doc/fr/autogen/user/fset_commands.adoc index b98c9d80d..dceb60f07 100644 --- a/doc/fr/autogen/user/fset_commands.adoc +++ b/doc/fr/autogen/user/fset_commands.adoc @@ -56,9 +56,8 @@ c:xxx afficher seulement les options qui correspondent à la condition évaluée "xxx", en utilisant les variables suiantes : file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values Les lignes avec des options sont affichées en utilisant l'évaluation de chaîne (voir /help eval pour le format), avec ces options : - - fset.format.option{1,2} : formats pour une option qui n'est pas marquée ni sur la ligne sélectionnée - - fset.format.option_marked{1,2} : formats pour une option marquée - - fset.format.option_selected{1,2} : formats pour une option sélectionnée + - fset.format.option1 : premier format pour une option + - fset.format.option2 : second format pour une option Les variables suivantes peuvent être utilisées dans ces options : - données de l'option, avec couleur et alignées avec des espaces sur la droite : diff --git a/doc/it/autogen/user/fset_commands.adoc b/doc/it/autogen/user/fset_commands.adoc index 7733cc3b1..3fde1857b 100644 --- a/doc/it/autogen/user/fset_commands.adoc +++ b/doc/it/autogen/user/fset_commands.adoc @@ -56,9 +56,8 @@ c:xxx show only options matching the evaluated condition "xxx", using following variables: file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values The lines with options are displayed using string evaluation (see /help eval for the format), with these options: - - fset.format.option{1,2}: formats for an option which is not marked nor the selected line - - fset.format.option_marked{1,2}: formats for a marked option - - fset.format.option_selected{1,2}: formats for the selected option + - fset.format.option1: first format for an option + - fset.format.option2: second format for an option The following variables can be used in these options: - option data, with color and padded by spaces on the right: diff --git a/doc/ja/autogen/user/fset_commands.adoc b/doc/ja/autogen/user/fset_commands.adoc index 7733cc3b1..3fde1857b 100644 --- a/doc/ja/autogen/user/fset_commands.adoc +++ b/doc/ja/autogen/user/fset_commands.adoc @@ -56,9 +56,8 @@ c:xxx show only options matching the evaluated condition "xxx", using following variables: file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values The lines with options are displayed using string evaluation (see /help eval for the format), with these options: - - fset.format.option{1,2}: formats for an option which is not marked nor the selected line - - fset.format.option_marked{1,2}: formats for a marked option - - fset.format.option_selected{1,2}: formats for the selected option + - fset.format.option1: first format for an option + - fset.format.option2: second format for an option The following variables can be used in these options: - option data, with color and padded by spaces on the right: diff --git a/doc/pl/autogen/user/fset_commands.adoc b/doc/pl/autogen/user/fset_commands.adoc index 7733cc3b1..3fde1857b 100644 --- a/doc/pl/autogen/user/fset_commands.adoc +++ b/doc/pl/autogen/user/fset_commands.adoc @@ -56,9 +56,8 @@ c:xxx show only options matching the evaluated condition "xxx", using following variables: file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values The lines with options are displayed using string evaluation (see /help eval for the format), with these options: - - fset.format.option{1,2}: formats for an option which is not marked nor the selected line - - fset.format.option_marked{1,2}: formats for a marked option - - fset.format.option_selected{1,2}: formats for the selected option + - fset.format.option1: first format for an option + - fset.format.option2: second format for an option The following variables can be used in these options: - option data, with color and padded by spaces on the right: diff --git a/po/cs.po b/po/cs.po index 51ff786b4..7ecc64f63 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -5546,10 +5546,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/de.po b/po/de.po index 5ec749e02..e92c89b4b 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-24 00:57+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -6688,10 +6688,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/es.po b/po/es.po index 72bf30f62..7582fb729 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5762,10 +5762,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/fr.po b/po/fr.po index 51941a917..d3f002a51 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-25 22:26+0200\n" -"PO-Revision-Date: 2017-06-25 23:19+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" +"PO-Revision-Date: 2017-06-26 21:57+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -6559,10 +6559,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" @@ -6746,10 +6744,8 @@ msgstr "" "\n" "Les lignes avec des options sont affichées en utilisant l'évaluation de " "chaîne (voir /help eval pour le format), avec ces options :\n" -" - fset.format.option{1,2} : formats pour une option qui n'est pas marquée " -"ni sur la ligne sélectionnée\n" -" - fset.format.option_marked{1,2} : formats pour une option marquée\n" -" - fset.format.option_selected{1,2} : formats pour une option sélectionnée\n" +" - fset.format.option1 : premier format pour une option\n" +" - fset.format.option2 : second format pour une option\n" "\n" "Les variables suivantes peuvent être utilisées dans ces options :\n" " - données de l'option, avec couleur et alignées avec des espaces sur la " diff --git a/po/hu.po b/po/hu.po index 333c021a1..831f8acaf 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5080,10 +5080,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/it.po b/po/it.po index 220e21c87..da69cfc2a 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -5933,10 +5933,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/ja.po b/po/ja.po index 59554d318..25a30aac1 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-25 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: weechat-dev \n" @@ -6393,10 +6393,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/pt.po b/po/pt.po index 9be39b7cb..facaf1cfd 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -6289,10 +6289,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index b7ba505fc..8ad341018 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -5726,10 +5726,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/ru.po b/po/ru.po index dbd379d50..3e5248159 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5118,10 +5118,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/tr.po b/po/tr.po index 2d2533130..6bae08963 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2017-06-23 11:58+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -4663,10 +4663,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/po/weechat.pot b/po/weechat.pot index 6d2aeb066..f2d6bcb91 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-25 22:26+0200\n" +"POT-Creation-Date: 2017-06-26 21:55+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -4641,10 +4641,8 @@ msgid "" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" -" - fset.format.option{1,2}: formats for an option which is not marked nor " -"the selected line\n" -" - fset.format.option_marked{1,2}: formats for a marked option\n" -" - fset.format.option_selected{1,2}: formats for the selected option\n" +" - fset.format.option1: first format for an option\n" +" - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n" diff --git a/src/plugins/fset/fset-command.c b/src/plugins/fset/fset-command.c index 2410177f9..6d5096094 100644 --- a/src/plugins/fset/fset-command.c +++ b/src/plugins/fset/fset-command.c @@ -661,11 +661,8 @@ fset_command_init () "\n" "The lines with options are displayed using string evaluation " "(see /help eval for the format), with these options:\n" - " - fset.format.option{1,2}: formats for an option which is not " - "marked nor the selected line\n" - " - fset.format.option_marked{1,2}: formats for a marked option\n" - " - fset.format.option_selected{1,2}: formats for the selected " - "option\n" + " - fset.format.option1: first format for an option\n" + " - fset.format.option2: second format for an option\n" "\n" "The following variables can be used in these options:\n" " - option data, with color and padded by spaces on the right:\n"