Merge pull request #1318 from arza-zara/typos

fset: fix typo in /help fset.format.option2

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}"+`

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}"+`

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "

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 "