summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/de/autogen/user/irc_options.adoc2
-rw-r--r--doc/en/autogen/user/irc_options.adoc2
-rw-r--r--doc/fr/autogen/user/irc_options.adoc2
-rw-r--r--doc/it/autogen/user/irc_options.adoc2
-rw-r--r--doc/ja/autogen/user/irc_options.adoc2
-rw-r--r--doc/pl/autogen/user/irc_options.adoc2
6 files changed, 6 insertions, 6 deletions
diff --git a/doc/de/autogen/user/irc_options.adoc b/doc/de/autogen/user/irc_options.adoc
index 3b11549d5..707d8aa40 100644
--- a/doc/de/autogen/user/irc_options.adoc
+++ b/doc/de/autogen/user/irc_options.adoc
@@ -363,7 +363,7 @@
** Standardwert: `+256+`
* [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** Beschreibung: pass:none[Server-Buffer zusammenfügen]
+** Beschreibung: pass:none[merge server buffers; this option has no effect if a layout is saved and is conflicting with this value (see /help layout)]
** Typ: integer
** Werte: merge_with_core, merge_without_core, independent
** Standardwert: `+merge_with_core+`
diff --git a/doc/en/autogen/user/irc_options.adoc b/doc/en/autogen/user/irc_options.adoc
index 81224163d..5ecfb2802 100644
--- a/doc/en/autogen/user/irc_options.adoc
+++ b/doc/en/autogen/user/irc_options.adoc
@@ -363,7 +363,7 @@
** default value: `+256+`
* [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** description: pass:none[merge server buffers]
+** description: pass:none[merge server buffers; this option has no effect if a layout is saved and is conflicting with this value (see /help layout)]
** type: integer
** values: merge_with_core, merge_without_core, independent
** default value: `+merge_with_core+`
diff --git a/doc/fr/autogen/user/irc_options.adoc b/doc/fr/autogen/user/irc_options.adoc
index 5f402d980..baa553219 100644
--- a/doc/fr/autogen/user/irc_options.adoc
+++ b/doc/fr/autogen/user/irc_options.adoc
@@ -363,7 +363,7 @@
** valeur par défaut: `+256+`
* [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** description: pass:none[mélanger les tampons de serveur]
+** description: pass:none[mélanger les tampons de serveur ; cette option n'a pas d'effet si une disposition est sauvée et qu'elle est en conflit avec cette valeur (voir /help layout)]
** type: entier
** valeurs: merge_with_core, merge_without_core, independent
** valeur par défaut: `+merge_with_core+`
diff --git a/doc/it/autogen/user/irc_options.adoc b/doc/it/autogen/user/irc_options.adoc
index e92db8ddc..fbee5ed3f 100644
--- a/doc/it/autogen/user/irc_options.adoc
+++ b/doc/it/autogen/user/irc_options.adoc
@@ -363,7 +363,7 @@
** valore predefinito: `+256+`
* [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** descrizione: pass:none[unisci i buffer dei server]
+** descrizione: pass:none[merge server buffers; this option has no effect if a layout is saved and is conflicting with this value (see /help layout)]
** tipo: intero
** valori: merge_with_core, merge_without_core, independent
** valore predefinito: `+merge_with_core+`
diff --git a/doc/ja/autogen/user/irc_options.adoc b/doc/ja/autogen/user/irc_options.adoc
index 581e232e1..e78878aee 100644
--- a/doc/ja/autogen/user/irc_options.adoc
+++ b/doc/ja/autogen/user/irc_options.adoc
@@ -363,7 +363,7 @@
** デフォルト値: `+256+`
* [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** 説明: pass:none[サーババッファをマージ]
+** 説明: pass:none[merge server buffers; this option has no effect if a layout is saved and is conflicting with this value (see /help layout)]
** タイプ: 整数
** 値: merge_with_core, merge_without_core, independent
** デフォルト値: `+merge_with_core+`
diff --git a/doc/pl/autogen/user/irc_options.adoc b/doc/pl/autogen/user/irc_options.adoc
index 2cce3001c..47bc4ee76 100644
--- a/doc/pl/autogen/user/irc_options.adoc
+++ b/doc/pl/autogen/user/irc_options.adoc
@@ -363,7 +363,7 @@
** domyślna wartość: `+256+`
* [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** opis: pass:none[połącz bufory serwerów]
+** opis: pass:none[merge server buffers; this option has no effect if a layout is saved and is conflicting with this value (see /help layout)]
** typ: liczba
** wartości: merge_with_core, merge_without_core, independent
** domyślna wartość: `+merge_with_core+`