diff --git a/doc/de/weechat_faq.de.txt b/doc/de/weechat_faq.de.txt
index a3ef9a796..e19915367 100644
--- a/doc/de/weechat_faq.de.txt
+++ b/doc/de/weechat_faq.de.txt
@@ -777,10 +777,10 @@ Damit WeeChat weniger Speicher benötigt, solltest Du folgende Tipps umsetzen:
 * lade keine Erweiterungen die Du nicht benötigst. Zum Beispiel: ASpell, Fifo,
   Logger, Perl, Python, Ruby, Lua, Tcl, Xfer (wird für DCC benötigst)
 * lade nur Skripten die Du auch benutzt
-* nutze einen kleineren Wert für die Option 'weechat.history.max_lines' (Anzahl
-  der Zeilen die für jeden Buffer im Speicher gehalten werden soll)
-* nutze einen kleineren Wert für die Option 'weechat.history.max_commands' (Anzahl
-  des Verlaufsspeichers, für Befehle, die im Speicher gehalten werden sollen)
+// TRANSLATION MISSING
+* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
+  of option 'weechat.history.max_buffer_lines_minutes'
+* nutze einen kleineren Wert für die Option 'weechat.history.max_commands'
 
 
 [[development]]
diff --git a/doc/en/weechat_faq.en.txt b/doc/en/weechat_faq.en.txt
index 4baeb749c..16b8aaf2b 100644
--- a/doc/en/weechat_faq.en.txt
+++ b/doc/en/weechat_faq.en.txt
@@ -741,10 +741,9 @@ You can try following tips to consume less memory:
 * do not load some plugins if you don't use them, for example: aspell, fifo,
   logger, perl, python, ruby, lua, tcl, xfer (used for DCC)
 * load only scripts that you really need
-* reduce value of option 'weechat.history.max_lines' (number of lines saved in
-  memory for each buffer)
-* reduce value of option 'weechat.history.max_commands' (number of user commands
-  saved in memory)
+* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
+  of option 'weechat.history.max_buffer_lines_minutes'
+* reduce value of option 'weechat.history.max_commands'
 
 
 [[development]]
diff --git a/doc/fr/weechat_faq.fr.txt b/doc/fr/weechat_faq.fr.txt
index 8b68d1232..e998d0373 100644
--- a/doc/fr/weechat_faq.fr.txt
+++ b/doc/fr/weechat_faq.fr.txt
@@ -770,10 +770,9 @@ Vous pouvez essayer les astuces suivantes pour consommer moins de mémoire :
   aspell, fifo, logger, perl, python, ruby, lua, tcl, xfer (utilisé pour les
   DCC)
 * charger uniquement les scripts dont vous avez vraiment besoin
-* réduire la valeur de l'option 'weechat.history.max_lines' (nombre de lignes
-  sauvées en mémoire pour chaque tampon)
-* réduire la valeur de l'option 'weechat.history.max_commands' (nombre de
-  commandes utilisateur sauvées en mémoire)
+* réduire la valeur de l'option 'weechat.history.max_buffer_lines_number' ou
+  affecter une valeur à l'option 'weechat.history.max_buffer_lines_minutes'
+* réduire la valeur de l'option 'weechat.history.max_commands'
 
 
 [[development]]
diff --git a/doc/it/weechat_faq.it.txt b/doc/it/weechat_faq.it.txt
index f2b9b6e92..b7aa1afd7 100644
--- a/doc/it/weechat_faq.it.txt
+++ b/doc/it/weechat_faq.it.txt
@@ -763,10 +763,10 @@ Esistono diversi trucchi per ottimizzare l'uso della memoria:
 * non caricare alcuni plugin se non vengono utilizzati, ad esempio: aspell, fifo,
   logger, perl, python, ruby, lua, tcl, xfer (usato per DCC)
 * caricare solo gli script veramente necessari
-* ridurre il valore dell'opzione 'weechat.history.max_lines' (numero di righe
-  salvate in memoria per ogni buffer)
-* ridurre il valore dell'opzione 'weechat.history.max_commands' (numero di
-  comandi utente salvati in memoria)
+// TRANSLATION MISSING
+* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
+  of option 'weechat.history.max_buffer_lines_minutes'
+* ridurre il valore dell'opzione 'weechat.history.max_commands'
 
 
 [[development]]
diff --git a/doc/ja/weechat_faq.ja.txt b/doc/ja/weechat_faq.ja.txt
index 9a2ce2528..c187645ee 100644
--- a/doc/ja/weechat_faq.ja.txt
+++ b/doc/ja/weechat_faq.ja.txt
@@ -696,10 +696,10 @@ OpenBSD では、プラグインファイル名の末尾が ".so.0.0" です (Li
 * 使わないプラグインのロードを禁止する、例えば: aspell、fifo、
   logger、perl、python、ruby、lua、tcl、xfer (DCC で使用)
 * 本当に必要なスクリプトだけをロード
-* 'weechat.history.max_lines' オプションの値を減らす
-  (それぞれのバッファでメモリ内に保存される行数)
-* 'weechat.history.max_commands' オプションの値を減らす
-  (メモリに保存されるユーザコマンドの数)
+// TRANSLATION MISSING
+* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
+  of option 'weechat.history.max_buffer_lines_minutes'
+* reduce value of option 'weechat.history.max_commands'
 
 
 [[development]]
diff --git a/doc/pl/weechat_faq.pl.txt b/doc/pl/weechat_faq.pl.txt
index da11bd12a..4c0b9440c 100644
--- a/doc/pl/weechat_faq.pl.txt
+++ b/doc/pl/weechat_faq.pl.txt
@@ -746,10 +746,10 @@ W celu zmniejszenia używanej pamięci możesz zastosować się do poniższych r
 * nie ładować nieużywanych pluginów, np: aspell, fifo, logger, perl, python,
   ruby, lua, tcl, xfer (używana do DCC)
 * ładować tylko naprawdę używane skrypty
-* zmniejszyć wartość opcji 'weechat.history.max_lines' (ilość linii trzymanych
-  w pamięci dla każdego bufora)
-* zmniejszyć wartość opcji 'weechat.history.max_commands' (ilość komend
-  użytkownika trzymanych w pamięci)
+// TRANSLATION MISSING
+* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
+  of option 'weechat.history.max_buffer_lines_minutes'
+* zmniejszyć wartość opcji 'weechat.history.max_commands'
 
 
 [[development]]