diff --git a/doc/en/autogen/user/fset_options.adoc b/doc/en/autogen/user/fset_options.adoc index c12809287..d2087cc1e 100644 --- a/doc/en/autogen/user/fset_options.adoc +++ b/doc/en/autogen/user/fset_options.adoc @@ -399,7 +399,7 @@ ** default value: `+""+` * [[option_fset.format.option2]] *fset.format.option2* -** description: pass:none[second format of each line with an option which is not marked not the selected one (note: content is evaluated, see /help fset); an empty string uses the default format ("${marked} ${name} ${type} ${value2}"), which is without evaluation of string and then much faster; formats can be switched with key ctrl+X] +** description: pass:none[second format of each line with an option which is not marked nor the selected one (note: content is evaluated, see /help fset); an empty string uses the default format ("${marked} ${name} ${type} ${value2}"), which is without evaluation of string and then much faster; formats can be switched with key ctrl+X] ** type: string ** values: any string ** default value: `+"${marked} ${name} ${type} ${value2}${newline} ${empty_name} ${_default_value}${color:darkgray} -- ${min}..${max}${newline} ${empty_name} ${description}"+` diff --git a/doc/it/autogen/user/fset_options.adoc b/doc/it/autogen/user/fset_options.adoc index 30e216d58..bf22d0b52 100644 --- a/doc/it/autogen/user/fset_options.adoc +++ b/doc/it/autogen/user/fset_options.adoc @@ -399,7 +399,7 @@ ** valore predefinito: `+""+` * [[option_fset.format.option2]] *fset.format.option2* -** descrizione: pass:none[second format of each line with an option which is not marked not the selected one (note: content is evaluated, see /help fset); an empty string uses the default format ("${marked} ${name} ${type} ${value2}"), which is without evaluation of string and then much faster; formats can be switched with key ctrl+X] +** descrizione: pass:none[second format of each line with an option which is not marked nor the selected one (note: content is evaluated, see /help fset); an empty string uses the default format ("${marked} ${name} ${type} ${value2}"), which is without evaluation of string and then much faster; formats can be switched with key ctrl+X] ** tipo: stringa ** valori: qualsiasi stringa ** valore predefinito: `+"${marked} ${name} ${type} ${value2}${newline} ${empty_name} ${_default_value}${color:darkgray} -- ${min}..${max}${newline} ${empty_name} ${description}"+` diff --git a/po/cs.po b/po/cs.po index 9c40272e9..d20fe0f4f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5658,7 +5658,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/de.po b/po/de.po index a89ba6dcd..556cea239 100644 --- a/po/de.po +++ b/po/de.po @@ -7082,7 +7082,7 @@ msgstr "" "schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/es.po b/po/es.po index 6e9a39d74..05a99a2b6 100644 --- a/po/es.po +++ b/po/es.po @@ -5860,7 +5860,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/fr.po b/po/fr.po index 0e4cc2d21..a8dda2bbe 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6928,7 +6928,7 @@ msgstr "" "les formats peuvent être changés avec la touche ctrl+X" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/hu.po b/po/hu.po index 3b5bc2f8e..a209dbfdc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5200,7 +5200,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/it.po b/po/it.po index e1a9b1a0a..805d6291e 100644 --- a/po/it.po +++ b/po/it.po @@ -6023,7 +6023,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/ja.po b/po/ja.po index 2d3a10ec0..9cfd873a9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6636,7 +6636,7 @@ msgstr "" "文字列を評価しないので高速です; 書式を切り替えるには ctrl+X を使います" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/pl.po b/po/pl.po index f45ff1577..52f4c47d6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6761,7 +6761,7 @@ msgstr "" "pomocą ctrl-X" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/pt.po b/po/pt.po index ad9b9905a..2a704fbd0 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6399,7 +6399,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/pt_BR.po b/po/pt_BR.po index f225d57d4..ef61028e3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5834,7 +5834,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/ru.po b/po/ru.po index 39dcd6c13..8749e94c3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5237,7 +5237,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/tr.po b/po/tr.po index 29f6ddfe4..5db9ed4ee 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4794,7 +4794,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/po/weechat.pot b/po/weechat.pot index 8d0947639..c64a34e03 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -4770,7 +4770,7 @@ msgid "" msgstr "" msgid "" -"second format of each line with an option which is not marked not the " +"second format of each line with an option which is not marked nor the " "selected one (note: content is evaluated, see /help fset); an empty string " "uses the default format (\"${marked} ${name} ${type} ${value2}\"), which " "is without evaluation of string and then much faster; formats can be " diff --git a/src/plugins/fset/fset-config.c b/src/plugins/fset/fset-config.c index 7c1b8170c..5994c9d5f 100644 --- a/src/plugins/fset/fset-config.c +++ b/src/plugins/fset/fset-config.c @@ -476,7 +476,7 @@ fset_config_init () fset_config_file, ptr_section, "option2", "string", N_("second format of each line with an option which is not marked " - "not the selected one " + "nor the selected one " "(note: content is evaluated, see /help fset); " "an empty string uses the default format " "(\"${marked} ${name} ${type} ${value2}\"), which is without "