core: improve help on option irc.look.server_buffer (closes #1269)

2018-11-12 21:02:25 +01:00 · 2018-11-12 21:02:25 +01:00 · 37a0cd0017
parent 39abe2fcd9
commit 37a0cd0017
20 changed files with 110 additions and 47 deletions
--- 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+`
--- 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+`
--- 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+`
--- 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+`
--- 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+`
--- 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+`
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8538,8 +8538,10 @@ msgstr ""
 "počet čistých zpráv uložených v paměti při zavření bufferu s čistými daty "
 "(zprávy budou zobrazeny při otevření bufferu s čistými daty)"

-msgid "merge server buffers"
-msgstr "spojit buffery serverů"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -12643,3 +12645,6 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
+
+#~ msgid "merge server buffers"
+#~ msgstr "spojit buffery serverů"
--- a/po/de.po
+++ b/po/de.po
@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-10-14 20:47+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@ -10234,8 +10234,10 @@ msgstr ""
 "der RAW-Daten-Buffer geschlossen ist (die Nachrichten werden umgehend "
 "angezeigt sobald der RAW-Daten-Buffer geöffnet wird)"

-msgid "merge server buffers"
-msgstr "Server-Buffer zusammenfügen"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -14724,3 +14726,6 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
+
+#~ msgid "merge server buffers"
+#~ msgstr "Server-Buffer zusammenfügen"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8834,8 +8834,10 @@ msgstr ""
 "número de mensajes brutos a mantener en memoria cuando el buffer de datos en "
 "bruto está cerrado (los mensajes serán mostrados cuando sea abra este buffer)"

-msgid "merge server buffers"
-msgstr "unir buffers de los servidores"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -12921,3 +12923,6 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse al transmisor"
+
+#~ msgid "merge server buffers"
+#~ msgstr "unir buffers de los servidores"
--- 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: 2018-11-12 20:54+0100\n"
-"PO-Revision-Date: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
+"PO-Revision-Date: 2018-11-12 21:01+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@ -10010,8 +10010,13 @@ msgstr ""
 "données brutes est fermé (ces messages seront affichés lors de l'ouverture "
 "du tampon des données brutes)"

-msgid "merge server buffers"
-msgstr "mélanger les tampons de serveur"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""
+"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)"

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -14454,3 +14459,6 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
+
+#~ msgid "merge server buffers"
+#~ msgstr "mélanger les tampons de serveur"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -7930,9 +7930,10 @@ msgid ""
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""

-#, fuzzy
-msgid "merge server buffers"
-msgstr "pufferek kezelése"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -11922,3 +11923,7 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
+
+#, fuzzy
+#~ msgid "merge server buffers"
+#~ msgstr "pufferek kezelése"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -9026,8 +9026,10 @@ msgstr ""
 "viene chiuso (i messaggi verranno visualizzati all'apertura del buffer dei "
 "dati raw)"

-msgid "merge server buffers"
-msgstr "unisci i buffer dei server"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -13136,3 +13138,6 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
+
+#~ msgid "merge server buffers"
+#~ msgstr "unisci i buffer dei server"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@ -9606,8 +9606,10 @@ msgstr ""
 "生データバッファが閉じられた時にメモリに保存する生メッセージの数 (生データ"
 "バッファを開いたときに表示されるメッセージ)"

-msgid "merge server buffers"
-msgstr "サーババッファをマージ"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -13889,3 +13891,6 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
+
+#~ msgid "merge server buffers"
+#~ msgstr "サーババッファをマージ"
--- a/po/pl.po
+++ b/po/pl.po
@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@ -9777,8 +9777,10 @@ msgstr ""
 "jest bufor nieprzetworzonych danych (wiadomości zostaną wyświetlone po "
 "otworzeniu dla nich bufora)"

-msgid "merge server buffers"
-msgstr "połącz bufory serwerów"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -14106,3 +14108,6 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
+
+#~ msgid "merge server buffers"
+#~ msgstr "połącz bufory serwerów"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@ -9464,8 +9464,10 @@ msgstr ""
 "buffer com dados em bruto (as mensagens são apresentadas ao abrir o buffer "
 "com dados em bruto)"

-msgid "merge server buffers"
-msgstr "unir buffers de servidores"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -13800,3 +13802,6 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
+
+#~ msgid "merge server buffers"
+#~ msgstr "unir buffers de servidores"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -8378,8 +8378,10 @@ msgid ""
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""

-msgid "merge server buffers"
-msgstr "mesclar buffers de servidores"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -12384,3 +12386,6 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
+
+#~ msgid "merge server buffers"
+#~ msgstr "mesclar buffers de servidores"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -7962,9 +7962,10 @@ msgid ""
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""

-#, fuzzy
-msgid "merge server buffers"
-msgstr "управление буферами"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
+msgstr ""

 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
@ -11954,3 +11955,7 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
+
+#, fuzzy
+#~ msgid "merge server buffers"
+#~ msgstr "управление буферами"
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\n"
 "PO-Revision-Date: 2018-11-04 21:44+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -7203,7 +7203,9 @@ msgid ""
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""

-msgid "merge server buffers"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
 msgstr ""

 msgid ""
--- 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: 2018-11-12 20:54+0100\n"
+"POT-Creation-Date: 2018-11-12 21:00+0100\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"
@ -7071,7 +7071,9 @@ msgid ""
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""

-msgid "merge server buffers"
+msgid ""
+"merge server buffers; this option has no effect if a layout is saved and is "
+"conflicting with this value (see /help layout)"
 msgstr ""

 msgid ""
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@ -2956,7 +2956,8 @@ irc_config_init ()
    irc_config_look_server_buffer = weechat_config_new_option (
        irc_config_file, ptr_section,
        "server_buffer", "integer",
-        N_("merge server buffers"),
+        N_("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", 0, 0, "merge_with_core",
        NULL, 0,
        NULL, NULL, NULL,