diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 8329d301f..91038a0d6 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -20,6 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 New features::
 
+  * core: add option `-save` in command `/upgrade` (issue #1630)
   * core: add option weechat.look.highlight_disable_regex and buffer property "highlight_disable_regex" (issue #1798)
   * api: rename function string_build_with_split_string to string_rebuild_split_string, add arguments "index_start" and "index_end"
   * api: add info "uptime_current"
diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc
index 4bc00e05a..d5b7c739d 100644
--- a/doc/de/includes/autogen_user_commands.de.adoc
+++ b/doc/de/includes/autogen_user_commands.de.adoc
@@ -2122,35 +2122,42 @@ Beispiele:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: WeeChat Binärdatei neu laden, ohne die Verbindung zum Server zu trennen
+* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-quit]
+/upgrade  [-yes] [<path_to_binary>|-save|-quit]
 
-          -yes: wird benötigt, sobald Option "weechat.look.confirm_upgrade" aktiviert ist
-path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei)
-        -dummy: ohne Funktion (dient lediglich dazu, um nicht versehentlich die "-quit" Funktion auszuführen)
-         -quit: trennt *ALLE* Verbindungen, speichert die aktuelle Sitzung und beendet WeeChat, um den aktuellen Zustand später wiederherstellen (siehe unten)
+          -yes: required if option "weechat.look.confirm_upgrade" is enabled
+path_to_binary: path to WeeChat binary (default is current binary)
+        -dummy: do nothing (option used to prevent accidental completion with "-quit")
+         -save: only save the session, do not quit nor reload WeeChat; the configuration files are not saved (if needed you can use /save before this command)
+         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
 
-Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager installiert worden sein.
+This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
 
-Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da diese Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt.
+Note: SSL connections are lost during upgrade (except with -save), because the reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
 
-Der Upgrade Vorgang besteht aus vier Schritten:
-  1. Sicherung der Sitzung, in Dateien für Core und Erweiterungen (buffers, history, ..)
-  2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden gesichert)
-  3. Sicherung der WeeChat Konfiguration (weechat.conf)
-  4. ausführen der neuen Version von WeeChat und wiederherstellen der Sitzung.
+Important: use of option -save can be dangerous, it is recommended to use only /upgrade (or with -quit) for a standard upgrade and a restart; the option -save can be used to save the session regularly and restore it in case of after abnormal exit (power outage, crash, etc.)
 
-Nutzt man die "-quit" Funktion ist die Abfolge geringfügig anders:
-  1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, ...)
-  2. die Sitzung wird in Dateien gesichert (*.upgrade)
-  3. alle Erweiterungen werden ausgeschaltet
-  4. die WeeChat Konfiguration wird gesichert
-  5. WeeChat wird beendet
-Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: weechat --upgrade
-WICHTIG: Die Sitzung muss mit exakt den selben Konfigurationsdateien wiederhergestellt werden (*.conf)
-Es ist möglich, die WeeChat-Sitzung auf einem anderen Computer wiederherzustellen, wenn Sie den Inhalt der WeeChat Verzeichnisse kopieren (siehe / debug dirs).
+Upgrade process has 4 steps:
+  1. save session into files for core and plugins (buffers, history, ..)
+  2. unload all plugins (configuration files (*.conf) are written on disk)
+  3. save WeeChat configuration (weechat.conf)
+  4. execute new WeeChat binary and reload session.
+
+With option "-quit", the process is:
+  1. close *ALL* connections (irc, xfer, relay, ...)
+  2. save session into files (*.upgrade)
+  3. unload all plugins
+  4. save WeeChat configuration
+  5. quit WeeChat
+
+With option "-save", the process is:
+  1. save session into files (*.upgrade) with a disconnected state for IRC servers and Relay clients (but no disconnection is made)
+
+With -quit or -save, you can restore the session later with this command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf) and if possible the same WeeChat version (or a more recent one).
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
 ----
 
 [[command_weechat_uptime]]
@@ -3130,70 +3137,72 @@ Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
           default -yes
           monitor [<filter>]
 
-       list: zeigt eine Liste aller Trigger (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-   listfull: zeigt eine detaillierte Liste, mit zusätzlichen Informationen, aller Trigger an
-listdefault: zeigt die standardmäßig genutzten Trigger an
-        add: fügt einen Trigger hinzu
-     addoff: fügt einen Trigger hinzu (deaktiviert)
- addreplace: erzeugt neuen Trigger oder ersetzt einen schon existierenden Trigger
-       name: Name des Trigger
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
        hook: signal, hsignal, modifier, line, print, command, command_run, timer, config, focus, info, info_hashtable
-  arguments: Argumente für den Hook, abhängig vom genutzten Hook (getrennt durch Semikolon):
-             signal: Name(en) des signals (erforderlich)
-             hsignal: Name(en) des hsignal (erforderlich)
-             modifier: Name(en) des modifier (erforderlich)
-             line: Buffertyp ("formatted", "free" oder "*"), Liste von Buffermasken, Tags
-             print: Buffer, Tags, Nachricht, Farben entfernen
-             command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung (alle Argumente, außer dem Befehl werden ausgewertet, "${tg_trigger_name}" wird durch den Triggernamen ersetzt, siehe /help eval)
-             command_run: Befehl(e) (erforderlich)
-             timer: Intervall (erforderlich), Anpassung an Sekunden (erforderlich), maximale Anzahl an Aufrufen
-             config: Name der Einstellung (erforderlich)
-             focus: Name(n) für sichtbaren Bereich (erforderlich) (z.B. "chat" für Chatbereich)
-             info: Name(n) der Information (erforderlich)
-             info_hashtable: Name(n) der Information (erforderlich)
- conditions: evaluierte Bedingungen für den Trigger
-      regex: einer oder mehrere reguläre Ausdrücke um Zeichenketten in Variablen zu ersetzen
-    command: Befehl welcher ausgeführt werden soll (mehrere Befehle müssen durch ";" voneinander getrennt werden)
-return_code: Rückgabewert für Callback (ok (standard), ok_eat, error)
-post_action: Aktion welche nach der Abarbeitung des Triggers ausgeführt werden soll (none (Standardwert), disable, delete)
-   addinput: erstellt einen Trigger mit einer standardmäßigen Mustervorlage
-      input: kopiert den kompletten Trigger-Befehl in die Eingabezeile
-     output: schickt den Trigger-Befehl als Text in den Buffer
-   recreate: wie "input", allerdings wird die Einstellung "addreplace" anstelle von "add" genutzt
-        set: definiert, innerhalb eines Triggers, eine Einstellung neu
-     option: Name einer Einstellung: name, hook, arguments, conditions, regex, command, return_code
-             (um Hilfe über eine Einstellung zu erhalten: /help trigger.trigger.<name>.<option>)
-      value: neuer Wert für Einstellung
-     rename: benennt einen Trigger um
-       copy: kopiert einen Trigger
-     enable: aktiviert Trigger (ohne Angabe von Argumenten: aktiviert alle Trigger)
-    disable: deaktiviert Trigger (ohne Angabe von Argumenten: deaktiviert alle Trigger)
-     toggle: de-/aktiviert Trigger (ohne Angabe von Argumenten: de-/aktiviert alle Trigger)
-    restart: startet Trigger neu (Hook(s) werden neu erstellt)
-       show: zeigt detaillierte Informationen zu einem Trigger (inklusive einer kleinen Statistik)
-        del: entfernt einen Trigger
-       -all: führt eine Aktion aus, die alle Trigger beinhaltet
-    restore: stellt Trigger mit Standardwerten wieder her (funktioniert nur bei vorgegebenen Triggern)
-    default: stellt die standardmäßigen Trigger wieder her
-    monitor: öffnet den Trigger Monitor-Buffer, mit optionaler Filterfunktion:
-     filter: filtert Hooks/Trigger zum Anzeigen (ein Hook muss mit "@" beginnen, zum Beispiel "@signal"), mehrere Filter können durch Kommata voneinander getrennt werden; Platzhalter "*" kann im Namen des Trigger verwendet werden
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
+             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
+             print: buffer, tags, message, strip colors
+             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, "${tg_trigger_name}" is replaced by the trigger name, see /help eval)
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+             info: name(s) of info (required)
+             info_hashtable: name(s) of info (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";")
+return_code: return code in callback (ok (default), ok_eat, error)
+post_action: action to take after execution (none (default), disable, delete)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-Wenn ein Trigger-Callback aufgerufen wird, dann wird folgende Befehlskette ausgeführt:
-  1. Überprüfung von Bedingungen; falls unwahr, beenden
-  2. ersetze Text mittels einem oder mehreren erweiterten regulären POSIX Ausdrücken (sofern im Trigger definiert)
-  3. ein oder mehrere Befehle werden ausgeführt (sofern im Trigger definiert)
-  4. Beendigung mit einem Rückgabewert (ausgenommen sind modifiers, line, focus, info und info_hashtable)
-  5. Aktion welche nach der Abarbeitung des Triggers ausgeführt werden soll
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifier, line, focus, info and info_hashtable)
+  5. perform post action
 
-Beispiele (die standardmäßig verfügbaren Trigger kann man sich mit "/trigger listdefault" anzeigen lassen):
-  fügt einer Nachricht die Textattribute *fett*, _unterstrichen_ und /kursiv/ hinzu:
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*([^ ]+)\*==*${color:bold}${re:1}${color:-bold}*== ==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/${color:italic}${re:1}${color:-italic}/"
-  verbirgt die Nicklist auf kleineren Terminals:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  speichert die Konfiguration jede Stunde ab:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  öffnet den Trigger Monitor und zeigt ausschließlich modifier und Trigger an, die mit "resize" im Namen beginnen:
+  silently save WeeChat session at midnight (see /help upgrade):
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 // end::trigger_commands[]
diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc
index deb158732..da8017e48 100644
--- a/doc/en/includes/autogen_user_commands.en.adoc
+++ b/doc/en/includes/autogen_user_commands.en.adoc
@@ -2122,19 +2122,22 @@ Examples:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-quit]
+/upgrade  [-yes] [<path_to_binary>|-save|-quit]
 
           -yes: required if option "weechat.look.confirm_upgrade" is enabled
 path_to_binary: path to WeeChat binary (default is current binary)
         -dummy: do nothing (option used to prevent accidental completion with "-quit")
+         -save: only save the session, do not quit nor reload WeeChat; the configuration files are not saved (if needed you can use /save before this command)
          -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
 
 This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
 
-Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+Note: SSL connections are lost during upgrade (except with -save), because the reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+
+Important: use of option -save can be dangerous, it is recommended to use only /upgrade (or with -quit) for a standard upgrade and a restart; the option -save can be used to save the session regularly and restore it in case of after abnormal exit (power outage, crash, etc.)
 
 Upgrade process has 4 steps:
   1. save session into files for core and plugins (buffers, history, ..)
@@ -2142,14 +2145,18 @@ Upgrade process has 4 steps:
   3. save WeeChat configuration (weechat.conf)
   4. execute new WeeChat binary and reload session.
 
-With option "-quit", the process is slightly different:
+With option "-quit", the process is:
   1. close *ALL* connections (irc, xfer, relay, ...)
   2. save session into files (*.upgrade)
   3. unload all plugins
   4. save WeeChat configuration
   5. quit WeeChat
-Then later you can restore session with command: weechat --upgrade
-IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+
+With option "-save", the process is:
+  1. save session into files (*.upgrade) with a disconnected state for IRC servers and Relay clients (but no disconnection is made)
+
+With -quit or -save, you can restore the session later with this command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf) and if possible the same WeeChat version (or a more recent one).
 It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
 ----
 
@@ -3193,6 +3200,8 @@ Examples (you can also look at default triggers with /trigger listdefault):
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
   silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
+  silently save WeeChat session at midnight (see /help upgrade):
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
   open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
diff --git a/doc/en/weechat_plugin_api.en.adoc b/doc/en/weechat_plugin_api.en.adoc
index d30cf783a..6ac9e5440 100644
--- a/doc/en/weechat_plugin_api.en.adoc
+++ b/doc/en/weechat_plugin_api.en.adoc
@@ -10898,7 +10898,8 @@ List of signals sent by WeeChat and plugins:
 | Signal SIGWINCH received (terminal was resized).
 
 | weechat | [[hook_signal_upgrade]] upgrade |
-| String: "quit" if "-quit" argument was given for /upgrade, otherwise NULL.
+| String: "quit" if "-quit" argument was given for /upgrade, "save" if "-save"
+  if "-save" argument was given for /upgrade, otherwise NULL.
 | Command `/upgrade` issued by user.
 
 | weechat | [[hook_signal_upgrade_ended]] upgrade_ended | 0.3.4
diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc
index ad56789e1..2324e7671 100644
--- a/doc/fr/includes/autogen_user_commands.fr.adoc
+++ b/doc/fr/includes/autogen_user_commands.fr.adoc
@@ -2122,34 +2122,41 @@ Exemples :
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: relancer le binaire WeeChat sans se déconnecter des serveurs
+* `+upgrade+`: sauvegarder la session WeeChat et relancer le binaire WeeChat sans se déconnecter des serveurs
 
 ----
-/upgrade  [-yes] [<chemin_vers_binaire>|-quit]
+/upgrade  [-yes] [<chemin_vers_binaire>|-save|-quit]
 
                -yes : requis si l'option "weechat.look.confirm_upgrade" est activée
 chemin_vers_binaire : chemin vers le binaire WeeChat (par défaut le binaire courant)
              -dummy : ne rien faire (option utilisée pour éviter une complétion accidentelle avec "-quit")
-              -quit : fermer *TOUTES* les connexions, sauver la session et quitter, ce qui rend possible une restauration différée (voir ci-dessous)
+              -save : sauvegarder seulement la session, ne pas quitter ni relancer WeeChat ; les fichiers de configuration ne sont pas sauvegardés (si besoin vous pouvez utiliser /save avant cette commande)
+              -quit : fermer *TOUTES* les connexions, sauvegarder la session et quitter, ce qui rend possible une restauration différée (voir ci-dessous)
 
 Cette commande met à jour et recharge une session de WeeChat qui tourne. Le nouveau binaire WeeChat doit avoir été compilé ou installé via un gestionnaire de paquet avant de lancer cette commande.
 
 Note : les connexions SSL sont perdues durant la mise à jour, car le rechargement de session SSL n'est pas possible actuellement avec GnuTLS. Il y a une reconnexion automatique après la mise à jour.
 
+Important : l'utilisation de l'option -save peut être dangereuse, il est recommandé d'utiliser seulement /upgrade (ou avec -quit) pour une mise à jour standard et un redémarrage ; l'option -save peut être utilisée pour sauvegarder régulièrement la session et la restaurer en cas de sortie anormale (panne de courant, crash, etc.).
+
 Le processus de mise à jour comporte 4 étapes :
   1. sauvegarder la session pour le cœur et les extensions (tampons, historique, ...)
   2. décharger toutes les extensions (les fichiers de configuration (*.conf) sont écrits sur disque)
   3. sauvegarder la configuration WeeChat (weechat.conf)
   4. exécuter le nouveau binaire WeeChat et recharger la session.
 
-Avec l'option "-quit", le processus est légèrement différent :
+Avec l'option "-quit", le processus est le suivant :
   1. fermer *TOUTES* les connexions
   2. sauvegarder la session (fichiers *.upgrade)
   3. décharger les extensions
   4. sauvegarder la configuration WeeChat
   5. quitter WeeChat
-Et plus tard vous pouvez restaurer la session avec la commande : weechat --upgrade
-IMPORTANT : vous devez restaurer la session avec exactement la même configuration (fichiers *.conf).
+
+Avec l'option "-save", le processus est le suivant :
+  1. sauvegarder la session (fichiers *.upgrade) avec un état déconnecté pour les serveurs IRC et les clients Relay (mais aucune déconnexion n'est faite)
+
+Avec "-quit" ou "-save", vous pouvez restaurer la session plus tard avec cette commande : weechat --upgrade
+IMPORTANT : vous devez restaurer la session avec exactement la même configuration (fichiers *.conf) et si possible la même version de WeeChat (ou une plus récente).
 Il est également possible de restaurer la session WeeChat sur une autre machine si vous y copiez le contenu des répertoires personnels de WeeChat (voir /debug dirs).
 ----
 
@@ -3191,8 +3198,10 @@ Exemples (vous pouvez aussi regarder les triggers par défaut avec /trigger list
   cacher la barre de pseudos sur les petits terminaux :
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  sauver la configuration chaque heure (de manière silencieuse) :
+  sauver silencieusement la configuration chaque heure :
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
+  sauver silencieusement la session WeeChat à minuit (voir /help upgrade) :
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
   ouvrir le tampon moniteur des triggers et afficher seulement les modificateurs et les triggers dont le nom commence par "resize" :
     /trigger monitor @modifier,resize*
 ----
diff --git a/doc/fr/weechat_plugin_api.fr.adoc b/doc/fr/weechat_plugin_api.fr.adoc
index 9c16ea295..6b74e6c6a 100644
--- a/doc/fr/weechat_plugin_api.fr.adoc
+++ b/doc/fr/weechat_plugin_api.fr.adoc
@@ -11116,7 +11116,8 @@ Liste des signaux envoyés par WeeChat et les extensions :
 | Signal SIGWINCH reçu (le terminal a été redimensionné).
 
 | weechat | [[hook_signal_upgrade]] upgrade |
-| Chaîne : "quit" si le paramètre "-quit" a été donné pour /upgrade, sinon NULL.
+| Chaîne : "quit" si le paramètre "-quit" a été donné pour /upgrade, "-save"
+  si le paramètre "-save" a été donné pour /upgrade, sinon NULL.
 | La commande `/upgrade` a été exécutée par l'utilisateur.
 
 | weechat | [[hook_signal_upgrade_ended]] upgrade_ended | 0.3.4
diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc
index f6f0d2564..c278d755f 100644
--- a/doc/it/includes/autogen_user_commands.it.adoc
+++ b/doc/it/includes/autogen_user_commands.it.adoc
@@ -2122,19 +2122,22 @@ Examples:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-quit]
+/upgrade  [-yes] [<path_to_binary>|-save|-quit]
 
           -yes: required if option "weechat.look.confirm_upgrade" is enabled
 path_to_binary: path to WeeChat binary (default is current binary)
         -dummy: do nothing (option used to prevent accidental completion with "-quit")
+         -save: only save the session, do not quit nor reload WeeChat; the configuration files are not saved (if needed you can use /save before this command)
          -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
 
 This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
 
-Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+Note: SSL connections are lost during upgrade (except with -save), because the reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+
+Important: use of option -save can be dangerous, it is recommended to use only /upgrade (or with -quit) for a standard upgrade and a restart; the option -save can be used to save the session regularly and restore it in case of after abnormal exit (power outage, crash, etc.)
 
 Upgrade process has 4 steps:
   1. save session into files for core and plugins (buffers, history, ..)
@@ -2142,14 +2145,18 @@ Upgrade process has 4 steps:
   3. save WeeChat configuration (weechat.conf)
   4. execute new WeeChat binary and reload session.
 
-With option "-quit", the process is slightly different:
+With option "-quit", the process is:
   1. close *ALL* connections (irc, xfer, relay, ...)
   2. save session into files (*.upgrade)
   3. unload all plugins
   4. save WeeChat configuration
   5. quit WeeChat
-Then later you can restore session with command: weechat --upgrade
-IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+
+With option "-save", the process is:
+  1. save session into files (*.upgrade) with a disconnected state for IRC servers and Relay clients (but no disconnection is made)
+
+With -quit or -save, you can restore the session later with this command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf) and if possible the same WeeChat version (or a more recent one).
 It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
 ----
 
@@ -3193,6 +3200,8 @@ Examples (you can also look at default triggers with /trigger listdefault):
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
   silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
+  silently save WeeChat session at midnight (see /help upgrade):
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
   open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
diff --git a/doc/it/weechat_plugin_api.it.adoc b/doc/it/weechat_plugin_api.it.adoc
index 5f939470c..c0d0d81c6 100644
--- a/doc/it/weechat_plugin_api.it.adoc
+++ b/doc/it/weechat_plugin_api.it.adoc
@@ -11329,7 +11329,8 @@ List of signals sent by WeeChat and plugins:
 
 // TRANSLATION MISSING
 | weechat | [[hook_signal_upgrade]] upgrade |
-| String: "quit" if "-quit" argument was given for /upgrade, otherwise NULL.
+| String: "quit" if "-quit" argument was given for /upgrade, "save" if "-save"
+  if "-save" argument was given for /upgrade, otherwise NULL.
 | Comando `/upgrade` digitato dall'utente.
 
 | weechat | [[hook_signal_upgrade_ended]] upgrade_ended | 0.3.4
diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc
index db5e8f115..2638097c4 100644
--- a/doc/ja/includes/autogen_user_commands.ja.adoc
+++ b/doc/ja/includes/autogen_user_commands.ja.adoc
@@ -2122,19 +2122,22 @@ option: オプションの名前
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: サーバとの接続を維持して WeeChat 実行バイナリを再読込
+* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-quit]
+/upgrade  [-yes] [<path_to_binary>|-save|-quit]
 
           -yes: required if option "weechat.look.confirm_upgrade" is enabled
 path_to_binary: path to WeeChat binary (default is current binary)
         -dummy: do nothing (option used to prevent accidental completion with "-quit")
+         -save: only save the session, do not quit nor reload WeeChat; the configuration files are not saved (if needed you can use /save before this command)
          -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
 
 This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
 
-Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+Note: SSL connections are lost during upgrade (except with -save), because the reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+
+Important: use of option -save can be dangerous, it is recommended to use only /upgrade (or with -quit) for a standard upgrade and a restart; the option -save can be used to save the session regularly and restore it in case of after abnormal exit (power outage, crash, etc.)
 
 Upgrade process has 4 steps:
   1. save session into files for core and plugins (buffers, history, ..)
@@ -2142,14 +2145,18 @@ Upgrade process has 4 steps:
   3. save WeeChat configuration (weechat.conf)
   4. execute new WeeChat binary and reload session.
 
-With option "-quit", the process is slightly different:
+With option "-quit", the process is:
   1. close *ALL* connections (irc, xfer, relay, ...)
   2. save session into files (*.upgrade)
   3. unload all plugins
   4. save WeeChat configuration
   5. quit WeeChat
-Then later you can restore session with command: weechat --upgrade
-IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+
+With option "-save", the process is:
+  1. save session into files (*.upgrade) with a disconnected state for IRC servers and Relay clients (but no disconnection is made)
+
+With -quit or -save, you can restore the session later with this command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf) and if possible the same WeeChat version (or a more recent one).
 It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
 ----
 
@@ -3193,6 +3200,8 @@ Examples (you can also look at default triggers with /trigger listdefault):
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
   silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
+  silently save WeeChat session at midnight (see /help upgrade):
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
   open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
diff --git a/doc/ja/weechat_plugin_api.ja.adoc b/doc/ja/weechat_plugin_api.ja.adoc
index 7759e2cc0..fd075655a 100644
--- a/doc/ja/weechat_plugin_api.ja.adoc
+++ b/doc/ja/weechat_plugin_api.ja.adoc
@@ -10947,8 +10947,10 @@ WeeChat とプラグインが送信するシグナルのリスト:
 | -
 | SIGWINCH シグナルを受信しました (端末サイズが変更されました)
 
+// TRANSLATION MISSING
 | weechat | [[hook_signal_upgrade]] upgrade |
-| String: /upgrade に "-quit" 引数が与えられた場合は "quit"、それ以外は NULL
+| String: "quit" if "-quit" argument was given for /upgrade, "save" if "-save"
+  if "-save" argument was given for /upgrade, otherwise NULL.
 | ユーザがコマンド `/upgrade` を実行
 
 | weechat | [[hook_signal_upgrade_ended]] upgrade_ended | 0.3.4
diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc
index cc0d3867c..ae57e473c 100644
--- a/doc/pl/includes/autogen_user_commands.pl.adoc
+++ b/doc/pl/includes/autogen_user_commands.pl.adoc
@@ -2121,35 +2121,42 @@ Przykłady:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: przeładowanie pliku binarnego WeeChat bez rozłączania z serwerami
+* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<ścieżka_do_binarki>|-quit]
+/upgrade  [-yes] [<path_to_binary>|-save|-quit]
 
-          -yes: wymagane, jeśli "weechat.look.confirm_upgrade" jest włączona
-ścieżka_do_binarki: ścieżka do pliku binarnego WeeChat (domyślnie jest to obecny plik)
-        -dummy: nic nie rób (opcja użyta w celu zapobiegnięcia przypadkowego dopełnienia za pomocą"-quit")
-         -quit: zamyka *WSZYSTKIE* połączenia, zapisuje sesję i wyłącza WeeChat, umożliwia to późniejsze przywrócenie (zobacz niżej)
+          -yes: required if option "weechat.look.confirm_upgrade" is enabled
+path_to_binary: path to WeeChat binary (default is current binary)
+        -dummy: do nothing (option used to prevent accidental completion with "-quit")
+         -save: only save the session, do not quit nor reload WeeChat; the configuration files are not saved (if needed you can use /save before this command)
+         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
 
-Ta komenda uaktualnia i przeładowuje działającą sesję WeeChat. Nowy plik binarny WeeChat powinien zostać skompilowany lub zainstalowany za pomocą managera pakietów przed uruchomieniem tej komendy.
+This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
 
-Uwaga: połączenia SSL są przerywane podczas uaktualniania, ponieważ przeładowanie sesji SSL nie jest obecnie możliwe za pomocą GnuTLS. Po uaktualnieniu nastąpi ponowne ich połączenie.
+Note: SSL connections are lost during upgrade (except with -save), because the reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
 
-Proces uaktualnienia składa się z 4 kroków:
-  1. zapisania sesji do plików dla rdzenia i wtyczek (bufory, historia, ..)
-  2. wyładowanie wszystkich wtyczek (zapisanie plików konfiguracyjnych *.conf)
-  3. zapisanie konfiguracji WeeChat (weechat.conf)
-  4. uruchomienie nowego pliku binarnego WeeChat i przeładowanie sesji.
+Important: use of option -save can be dangerous, it is recommended to use only /upgrade (or with -quit) for a standard upgrade and a restart; the option -save can be used to save the session regularly and restore it in case of after abnormal exit (power outage, crash, etc.)
 
-Z opcją "-quit", proces przebiega inaczej:
-  1. zamknięcie *WSZYSTKICH* połączeń (irc, xfer, relay, ...)
-  2. zapisanie sesji do pliku (*.upgrade)
-  3. wyładowanie wszystkich wtyczek
-  4. zapisanie konfiguracji WeeChat
-  5. wyłączenie WeeChat
-Następnie można przywrócić sesję za pomocą komendy: weechat --upgrade
-WAŻNE: należy przywracać sesję z identyczną konfiguracją (pliki *.conf).
-Jest możliwe przywrócenie sesji WeeChat na innej maszynie, jeśli skopiujemy zawartość katalogów domowych WeeChat (zobacz /debug dirs).
+Upgrade process has 4 steps:
+  1. save session into files for core and plugins (buffers, history, ..)
+  2. unload all plugins (configuration files (*.conf) are written on disk)
+  3. save WeeChat configuration (weechat.conf)
+  4. execute new WeeChat binary and reload session.
+
+With option "-quit", the process is:
+  1. close *ALL* connections (irc, xfer, relay, ...)
+  2. save session into files (*.upgrade)
+  3. unload all plugins
+  4. save WeeChat configuration
+  5. quit WeeChat
+
+With option "-save", the process is:
+  1. save session into files (*.upgrade) with a disconnected state for IRC servers and Relay clients (but no disconnection is made)
+
+With -quit or -save, you can restore the session later with this command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf) and if possible the same WeeChat version (or a more recent one).
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
 ----
 
 [[command_weechat_uptime]]
@@ -3129,70 +3136,72 @@ Bez argumentów ta komenda wyświetli wszystkie załadowane wtyczki.
           default -yes
           monitor [<filtr>]
 
-       list: lista triggerów (jeśli nie podano argumentu, wyświetli się ta lista)
-   listfull: lista triggerów ze szczegółowymi informacjami
-listdefault: lista domyślnych triggerów
-        add: dodaje trigger
-     addoff: dodaje trigger (wyłączony)
- addreplace: dodaje lub zastępuje istniejący trigger
-       nazwa: nazwa triggera
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
        hook: signal, hsignal, modifier, line, print, command, command_run, timer, config, focus, info, info_hashtable
-  argumenty: argumenty dla uchwytu, w zależności od jego typu (oddzielone średnikami):
-             signal: nazwa(-y) signal (wymagane)
-             hsignal: nazwa(-y) hsignal (wymagane)
-             modifier: nazwa(-y) modifier (wymagane)
-             line: typ bufora("formatted", "free" lub "*"), lista mask buforów, tagi
-             print: bufor, tagi, wiadomość, pomiń kolory
-             command: komenda (wymagane), opis, argumenty, opis argumentów, dopełnienie (wszystkie argumenty poza komendą są przetwarzane, "${tg_trigger_name}" jest zastępowane przez nazwę triggera, zobacz /help eval)
-             command_run: komenda(-y) (wymagane)
-             timer: interwał (wymagane), wyrównanie sekund, ilość wywołań
-             config: nazwa(-y) opcji (wymagane)
-             focus: nazwa(-y) obszarów (wymagane)
-             info: nazwa(y) informacji (wymagane)
-             info_hashtable: nazwa(y) informacji (wymagane)
- warunki: przetwarzane warunki dla triggera
-      regex: jedno lub więcej wyrażeń regularnych do zastępowania ciągów w zmiennych
-    komenda: komenda do wykonania (wiele komend można oddzielić ";")
-zwracany_kod: kod zwracany w callbacku (ok (domyślne), ok_eat, error)
-post_action: akcja do wykonania po zakończeniu (none (domyślne), disable, delete)
-   addinput: ustawia wejście z domyślnymi argumentami do stworzenia triggera
-      input: ustawia wejście z komendą użytą do stworzenia triggera
-     output: wysyła komendę do stworzenia triggera do buforu
-   recreate: tak samo jak "input", z opcją "addreplace" zamiast "add"
-        set: ustawia opcje triggera
-     opcja: nazwa opcji: name, hook, arguments, conditions, regex, command, return_code
-             (aby uzyskać pomoc na temat opcji możesz wpisać: /help trigger.trigger.<nazwa>.<opcja>)
-      wartość: nowa wartość dla opcji
-     rename: zmienia nazwę triggera
-       copy: kopiuje trigger
-     enable: włącza trigger(y) (bez argumentów: włącza triggery globalnie)
-    disable: wyłącza trigger(y) (bez argumentów: wyłącza triggery globalnie)
-     toggle: zmienia stan triggera(-ów) (bez argumentów: zmienia stan triggerów globalnie)
-    restart: restartuje trigger(y) (tworzy na nowo uchwyty)
-       show: pokazuje szczegółowe informacje o triggerze (z niektórymi statystykami)
-        del: usuwa trigger
-       -all: wykonaj akcję na wszystkich triggerach
-    restore: przywraca trigger(y) z domyślnymi wartościami (działa tylko dla domyślnych triggerów)
-    default: przywraca domyślne triggery
-    monitor: otwiera bufor monitorowania triggerów, z opcjonalnym filtrem:
-     filtr: filtruje uchwyty/triggery do wyświetlenia (uchwyt musi się zaczynać od "@", na przykład "@signal"), wiele filtrów może być oddzielonych przecinkiem; dzika karta "*" jest dozwolona w nazwie każdego triggera
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
+             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
+             print: buffer, tags, message, strip colors
+             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, "${tg_trigger_name}" is replaced by the trigger name, see /help eval)
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+             info: name(s) of info (required)
+             info_hashtable: name(s) of info (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";")
+return_code: return code in callback (ok (default), ok_eat, error)
+post_action: action to take after execution (none (default), disable, delete)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-Kiedy callback triggera jest wywoływany, wykonywane są następujące akcje, w kolejności:
-  1. sprawdzenie warunków; jeśli nie są spełnione, wyjście
-  2. zastąpienie tekstu za pomocą rozszerzonych wyrażeń regularnych POSIX (jeśli zdefiniowane)
-  3. wykonanie komend(y) (jeśli zdefiniowane)
-  4. wyjście z kodem wyjścia (poza modifiers i focus)
-  5. wykonanie akcji kończącej
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifier, line, focus, info and info_hashtable)
+  5. perform post action
 
-Przykłady (możesz też spojrzeć na domyślne triggery za pomocą /trigger listdefault):
-  dodaje atrybuty tekstu *bold*, _underline_ i /italic/ (tylko w wiadomościach użytkowników):
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*([^ ]+)\*==*${color:bold}${re:1}${color:-bold}*== ==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/${color:italic}${re:1}${color:-italic}/"
-  ukrywa pasek z nickami na małych terminalach:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  cichy zapis plików konfiguracyjnych co każdą godzinę:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  otwiera monitor triggerów i pokazuje tylko modifiers i triggery, których nazwa zaczyna się od "resize":
+  silently save WeeChat session at midnight (see /help upgrade):
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 // end::trigger_commands[]
diff --git a/doc/sr/includes/autogen_user_commands.sr.adoc b/doc/sr/includes/autogen_user_commands.sr.adoc
index 8f6844d5e..a79b07309 100644
--- a/doc/sr/includes/autogen_user_commands.sr.adoc
+++ b/doc/sr/includes/autogen_user_commands.sr.adoc
@@ -2122,35 +2122,42 @@ passphrase: измена тајне реченице (без passphrase, под
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: поновно учитавање WeeChat бинарног фајла без прекидања конекције са серверима
+* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<путања_до_бинарног>|-quit]
+/upgrade  [-yes] [<path_to_binary>|-save|-quit]
 
-              -yes: обавезно ако је укључена опција „weechat.look.confirm_upgrade”
-путања_до_бинарног: путања до WeeChat бинарног фајла (подразумевано је текући бинарни фајл)
-            -dummy: не ради ништа (опција која се користи за спречавање нехотичног довршавања са „-quit”)
-             -quit: затвара *СВЕ* конекције, чува сесију и напушта програм WeeChat, чиме се омогућава закашњена рестаурација (погледајте испод)
+          -yes: required if option "weechat.look.confirm_upgrade" is enabled
+path_to_binary: path to WeeChat binary (default is current binary)
+        -dummy: do nothing (option used to prevent accidental completion with "-quit")
+         -save: only save the session, do not quit nor reload WeeChat; the configuration files are not saved (if needed you can use /save before this command)
+         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
 
-Ова команда ажурира и поновно учитава WeeChat сесију која се извршава. Нови WeeChat бинарни фајл мора бити компајлиран или инсталиран менаџером пакета пре покретања ове команде.
+This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
 
-Напомена: SSL конекције се губе током ажурирања, јер тренутно са GnuTLS није могуће поновно учитавање SSL сесија. Постоји аутоматско поновно успостављање конекције након ажурирања.
+Note: SSL connections are lost during upgrade (except with -save), because the reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
 
-Процес ажурирања има 4 корака:
-  1. чување сесије у фајлове за језгро и додатке (бафери, историја, ..)
-  2. уклањање свих додатака из меморије (конфигурациони фајлови (*.conf) се уписују на диск)
-  3. чување WeeChat конфигурације (weechat.conf)
-  4. извршавање новог WeeChat бинарног фајла и поновно учитавање сесије.
+Important: use of option -save can be dangerous, it is recommended to use only /upgrade (or with -quit) for a standard upgrade and a restart; the option -save can be used to save the session regularly and restore it in case of after abnormal exit (power outage, crash, etc.)
 
-Са опцијом „-quit”, процес је малко другачији:
-  1. затварање *СВИХ* конекција (irc, xfer, relay, ...)
-  2. чување сесије у фајлове (*.upgrade)
-  3. уклањање свих додатака из меморије
-  4. чување WeeChat конфигурације
-  5. напуштање програма WeeChat
-Затим касније можете да обновите сесију командом: weechat --upgrade
-ВАЖНО: сесију морате да обновите са потпуно истом конфигурацијом (фајлови *.conf).
-WeeChat сесија може да се обнови на другој машини ако копирате садржај WeeChat почетних директоријума (погледајте /debug dirs).
+Upgrade process has 4 steps:
+  1. save session into files for core and plugins (buffers, history, ..)
+  2. unload all plugins (configuration files (*.conf) are written on disk)
+  3. save WeeChat configuration (weechat.conf)
+  4. execute new WeeChat binary and reload session.
+
+With option "-quit", the process is:
+  1. close *ALL* connections (irc, xfer, relay, ...)
+  2. save session into files (*.upgrade)
+  3. unload all plugins
+  4. save WeeChat configuration
+  5. quit WeeChat
+
+With option "-save", the process is:
+  1. save session into files (*.upgrade) with a disconnected state for IRC servers and Relay clients (but no disconnection is made)
+
+With -quit or -save, you can restore the session later with this command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf) and if possible the same WeeChat version (or a more recent one).
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
 ----
 
 [[command_weechat_uptime]]
@@ -3130,70 +3137,72 @@ autoload: учитавање свих скрипти из „autoload” дир
           default -yes
           monitor [<филтер>]
 
-       list: листа окидача (без аргумента се приказује ова листа)
-   listfull: листа окидача са детаљним инфо о сваком окидачу
-listdefault: листа подразумеваних окидача
-        add: додавање окидача
-     addoff: додавање окидача (искљученог)
- addreplace: додавање или замена постојећег окидача
-        име: име окидача
-       кука: signal, hsignal, modifier, line, print, command, command_run, timer, config, focus, info, info_hashtable
-  аргументи: аргументи за куку, у зависности од куке (раздвојени тачка запетама):
-             signal: име(на) signal-а (обавезно)
-             hsignal: име(на) hsignal-а (обавезно)
-             modifier: име(на) modifier-а (обавезно)
-             line: тип бафера („formatted”, „free” или „*”), листа маски бафера, ознака
-             print: бафер, ознаке, порука, уклањање боја
-             command: команда (обавезна), опис, аргументи, опис аргумената, довршавање (сви аргументи осим command се израчунавају, „${tg_trigger_name}” се замењује именом окидача, погледајте /help eval)
-             command_run: команд(а/е) (обавезно)
-             timer: интервал (обавезан), поравнање на секунди, макс позива
-             config: име(на) опције (обавезно)
-             focus: име(на) површине (обавезно)
-             info: име(на) информације (обавезно)
-             info_hashtable: име(на) информације (обавезно)
-     услови: израчунати услови за окидач
-   регизраз: један или више регуларних израза за замену стрингова у променљивама
-    команда: команда која треба да се изврши (више команди може да се раздвоји са „;”)
-   повр_кôд: повратни кôд у функцији повратног позива (ok (подраз), ok_eat, error)
-пост_акција: акција која се покреће након извршавања (none (подраз), disable, delete)
-   addinput: постављање улаза на подразумеване аргументе да се креира окидач
-      input: постављање улаза на команду која је употребљена за креирање окидача
-     output: слање команде за креирање окидача у бафер
-   recreate: исто као „input”, са опцијом „addreplace” уместо „add”
-        set: постављање опције у окидачу
-     опција: име опције: name, hook, arguments, conditions, regex, command, return_code
-             (за помоћ у вези опције, можете да откуцате: /help trigger.trigger.<име>.<опција>)
-   вредност: нова вредност опције
-     rename: промена имена окидача
-       copy: копирање окидача
-     enable: укључивање окидача (без аргумената: окидачи се укључују глобално)
-    disable: искључивање окидача (без аргумената: окидачи се искључују глобално)
-     toggle: пребацивање окидача (без аргумената: окидачи се пребацују глобално)
-    restart: поновно покретање окидача (куке се поново креирају)
-       show: приказ детаљних информација о окидачу (са мало статистике)
-        del: брисање окидача
-       -all: извршавање акције над свим окидачима
-    restore: обнављање окидача са подразумеваним вредностима (функционише само за подразумеване окидаче)
-    default: брисање свих окидача и обнављање подразумеваних
-    monitor: отварање бафера за праћење окидача, са необавезним филтером:
-     филтер: филтрирање кука/окидача који се приказују (кука мора да почиње са „@”, на пример „@signal”), више филтера може да се раздвоји запетама; дозвољен је џокер „*” у сваком имену окидача
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
+       hook: signal, hsignal, modifier, line, print, command, command_run, timer, config, focus, info, info_hashtable
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
+             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
+             print: buffer, tags, message, strip colors
+             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, "${tg_trigger_name}" is replaced by the trigger name, see /help eval)
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+             info: name(s) of info (required)
+             info_hashtable: name(s) of info (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";")
+return_code: return code in callback (ok (default), ok_eat, error)
+post_action: action to take after execution (none (default), disable, delete)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-Када се позове функција повратног позива окидача, извршавају се следеће акције, у наведеном редоследу:
-  1. провера услова; ако је нетачно, напушта се
-  2. замена текста употребом POSIX проширених регуларних израза (ако су дефинисани у окидачу)
-  3. извршавање команд(е/и) (ако су дефинисане у окидачу)
-  4. излазак са повратним кодом (осим за modifier, line, focus, info и info_hashtable)
-  5. извршавање пост акције
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifier, line, focus, info and info_hashtable)
+  5. perform post action
 
-Примери (такође можете да погледате садржај подразумеваних окидача са /trigger listdefault):
-  додавање текст атрибута *подебљано*, _подвучено и /курзив/ (само у корисничким порукама):
-    /trigger add effects modifier weechat_print „${tg_tag_nick}” "==\*([^ ]+)\*==*${color:bold}${re:1}${color:-bold}*== ==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/${color:italic}${re:1}${color:-italic}/"
-  сакривање траке листе надимака на малим терминалима:
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
+    /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*([^ ]+)\*==*${color:bold}${re:1}${color:-bold}*== ==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/${color:italic}${re:1}${color:-italic}/"
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  чување конфигурације на сваки сат, у тишини:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  отварање монитора окидача и приказ само модификатора и окидача чије име почиње са „resize”:
+  silently save WeeChat session at midnight (see /help upgrade):
+    /trigger add session_save signal day_changed "" "" "/mute /upgrade -save"
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 // end::trigger_commands[]
diff --git a/doc/sr/weechat_plugin_api.sr.adoc b/doc/sr/weechat_plugin_api.sr.adoc
index 903da2019..61d87977c 100644
--- a/doc/sr/weechat_plugin_api.sr.adoc
+++ b/doc/sr/weechat_plugin_api.sr.adoc
@@ -10527,8 +10527,10 @@ struct t_hook *weechat_hook_signal (const char *signal,
 | - |
 Примљен је сигнал SIGWINCH (промењена је величина терминала).
 
+// TRANSLATION MISSING
 | weechat | [[hook_signal_upgrade]] upgrade |
-| Стринг: "quit" ако је за /upgrade наведен аргумент „-quit”, у супротном NULL.
+| String: "quit" if "-quit" argument was given for /upgrade, "save" if "-save"
+  if "-save" argument was given for /upgrade, otherwise NULL.
 | Корисник је задао команду `/upgrade`.
 
 | weechat | [[hook_signal_upgrade_ended]] upgrade_ended | 0.3.4
diff --git a/po/cs.po b/po/cs.po
index 9a5765343..e77959f8e 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-06-18 16:11+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -992,6 +992,14 @@ msgstr "%sReset všech nastavení není povolen"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d volba/volby resetovány, %d volba/volby smazány"
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sChyba: nemohu uložit sezení do souboru"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sChyba: nemohu uložit sezení do souboru"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1018,10 +1026,6 @@ msgstr "%sNení specifikována binárka"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Aktualizuji WeeChat s použitím binárního souboru: \"%s\"..."
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sChyba: nemohu uložit sezení do souboru"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "***** Chyba: exec selhal (program: \"%s\"), ukončuji WeeChat"
@@ -2585,10 +2589,14 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "aktualizovat WeeChat bez odpojení od serveru"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes][<cesta_k_binárce>|-quit]"
 
 #, fuzzy
@@ -2598,6 +2606,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -2605,9 +2616,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -2615,15 +2631,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -12909,6 +12932,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -13543,3 +13569,8 @@ 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)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "verze WeeChat"
diff --git a/po/de.po b/po/de.po
index aa7cdc21b..b590de933 100644
--- a/po/de.po
+++ b/po/de.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-08-05 09:49+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -1027,6 +1027,16 @@ msgstr "%sDas Zurücksetzen aller Einstellungen ist nicht zulässig"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d Einstellung(en) wieder hergestellt, %d Einstellung(en) entfernt"
 
+#, fuzzy, c-format
+#| msgid "%sUnable to save session in file"
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sSitzung kann nicht in eine Datei gespeichert werden"
+
+#, fuzzy
+#| msgid "%sUnable to save session in file"
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sSitzung kann nicht in eine Datei gespeichert werden"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1054,10 +1064,6 @@ msgstr "%skeine Binärdatei angegeben"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Aktualisiere WeeChat mit Binärdatei \"%s\"...."
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sSitzung kann nicht in eine Datei gespeichert werden"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -3342,19 +3348,64 @@ msgstr ""
 "  Alle Farbeinstellungen zurücksetzen:\n"
 "    /unset -mask weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+#, fuzzy
+#| msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr ""
 "WeeChat Binärdatei neu laden, ohne die Verbindung zum Server zu trennen"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<path_to_binary>|-quit]"
 
+#, fuzzy
+#| msgid ""
+#| "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
+#| "enabled\n"
+#| "path_to_binary: path to WeeChat binary (default is current binary)\n"
+#| "        -dummy: do nothing (option used to prevent accidental completion "
+#| "with \"-quit\")\n"
+#| "         -quit: close *ALL* connections, save session and quit WeeChat, "
+#| "which makes possible a delayed restoration (see below)\n"
+#| "\n"
+#| "This command upgrades and reloads a running WeeChat session. The new "
+#| "WeeChat binary must have been compiled or installed with a package "
+#| "manager before running this command.\n"
+#| "\n"
+#| "Note: SSL connections are lost during upgrade, because reload of SSL "
+#| "sessions is currently not possible with GnuTLS. There is automatic "
+#| "reconnection after upgrade.\n"
+#| "\n"
+#| "Upgrade process has 4 steps:\n"
+#| "  1. save session into files for core and plugins (buffers, history, ..)\n"
+#| "  2. unload all plugins (configuration files (*.conf) are written on "
+#| "disk)\n"
+#| "  3. save WeeChat configuration (weechat.conf)\n"
+#| "  4. execute new WeeChat binary and reload session.\n"
+#| "\n"
+#| "With option \"-quit\", the process is slightly different:\n"
+#| "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
+#| "  2. save session into files (*.upgrade)\n"
+#| "  3. unload all plugins\n"
+#| "  4. save WeeChat configuration\n"
+#| "  5. quit WeeChat\n"
+#| "Then later you can restore session with command: weechat --upgrade\n"
+#| "IMPORTANT: you must restore the session with exactly same configuration "
+#| "(files *.conf).\n"
+#| "It is possible to restore WeeChat session on another machine if you copy "
+#| "the content of WeeChat home directories (see /debug dirs)."
 msgid ""
 "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
 "enabled\n"
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3362,9 +3413,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3372,15 +3428,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -6281,85 +6344,6 @@ msgstr ""
 msgid "bar item with list of buffers"
 msgstr "Bar-Item mit der Liste von Buffern"
 
-#| msgid ""
-#| " enable: enable buflist\n"
-#| "disable: disable buflist\n"
-#| " toggle: toggle buflist\n"
-#| "    bar: add the \"buflist\" bar\n"
-#| "refresh: force the refresh of the bar items (buflist, buflist2 and "
-#| "buflist3)\n"
-#| "\n"
-#| "The lines with buffers are displayed using string evaluation (see /help "
-#| "eval for the format), with these options:\n"
-#| "  - buflist.look.display_conditions: conditions to display a buffer in "
-#| "the list\n"
-#| "  - buflist.format.buffer: format for a buffer which is not current "
-#| "buffer\n"
-#| "  - buflist.format.buffer_current: format for the current buffer\n"
-#| "\n"
-#| "The following variables can be used in these options:\n"
-#| "  - bar item data (see hdata \"bar_item\" in API doc for a complete "
-#| "list), for example:\n"
-#| "    - ${bar_item.name}\n"
-#| "  - window data, where the bar item is displayed (there's no window in "
-#| "root bars, see hdata \"window\" in API doc for a complete list), for "
-#| "example:\n"
-#| "    - ${window.number}\n"
-#| "    - ${window.buffer.full_name}\n"
-#| "  - buffer data (see hdata \"buffer\" in API doc for a complete list), "
-#| "for example:\n"
-#| "    - ${buffer.number}\n"
-#| "    - ${buffer.name}\n"
-#| "    - ${buffer.full_name}\n"
-#| "    - ${buffer.short_name}\n"
-#| "    - ${buffer.nicklist_nicks_count}\n"
-#| "  - irc_server: IRC server data, defined only on an IRC buffer (see hdata "
-#| "\"irc_server\" in API doc)\n"
-#| "  - irc_channel: IRC channel data, defined only on an IRC channel buffer "
-#| "(see hdata \"irc_channel\" in API doc)\n"
-#| "  - extra variables added by buflist for convenience:\n"
-#| "    - ${format_buffer}: the evaluated value of option buflist.format."
-#| "buffer; this can be used in option buflist.format.buffer_current to just "
-#| "change the background color for example\n"
-#| "    - ${current_buffer}: a boolean (\"0\" or \"1\"), \"1\" if this is the "
-#| "current buffer; it can be used in a condition: ${if:"
-#| "${current_buffer}?...:...}\n"
-#| "    - ${merged}: a boolean (\"0\" or \"1\"), \"1\" if the buffer is "
-#| "merged with at least another buffer; it can be used in a condition: ${if:"
-#| "${merged}?...:...}\n"
-#| "    - ${format_number}: indented number with separator (evaluation of "
-#| "option buflist.format.number)\n"
-#| "    - ${number}: indented number, for example \" 1\" if there are between "
-#| "10 and 99 buffers; for merged buffers, this variable is set with number "
-#| "for the first buffer and spaces for the next buffers with same number\n"
-#| "    - ${number2}: indented number, for example \" 1\" if there are "
-#| "between 10 and 99 buffers\n"
-#| "    - ${number_displayed}: \"1\" if the number is displayed, otherwise "
-#| "\"0\"\n"
-#| "    - ${indent}: indentation for name (channel and private buffers are "
-#| "indented) (evaluation of option buflist.format.indent)\n"
-#| "    - ${format_nick_prefix}: colored nick prefix for a channel "
-#| "(evaluation of option buflist.format.nick_prefix)\n"
-#| "    - ${color_nick_prefix}: color of nick prefix for a channel (set only "
-#| "if the option buflist.look.nick_prefix is enabled)\n"
-#| "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
-#| "buflist.look.nick_prefix is enabled)\n"
-#| "    - ${format_name}: formatted name (evaluation of option buflist.format."
-#| "name)\n"
-#| "    - ${name}: the short name (if set), with a fallback on the name\n"
-#| "    - ${color_hotlist}: the color depending on the highest hotlist level "
-#| "for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx "
-#| "is the level)\n"
-#| "    - ${format_hotlist}: the formatted hotlist (evaluation of option "
-#| "buflist.format.hotlist)\n"
-#| "    - ${hotlist}: the raw hotlist\n"
-#| "    - ${hotlist_priority}: \"none\", \"low\", \"message\", \"private\" or "
-#| "\"highlight\"\n"
-#| "    - ${format_lag}: the lag for an IRC server buffer, empty if there's "
-#| "no lag (evaluation of option buflist.format.lag)\n"
-#| "    - ${format_tls_version}: indicator of TLS version for a server "
-#| "buffer, empty for channels (evaluation of option buflist.format."
-#| "tls_version)"
 msgid ""
 " enable: enable buflist\n"
 "disable: disable buflist\n"
@@ -6516,8 +6500,8 @@ msgstr ""
 "    - ${hotlist}: die Hotlist in der Rohform\n"
 "    - ${hotlist_priority}: \"none\", \"low\", \"message\", \"private\" oder "
 "\"highlight\"\n"
-"    - ${hotlist_priority_number}: -1 = keine, 0 = niedrig, 1 = Nachricht, 2 ="
-" private, 3 = Hervorhebungen\n"
+"    - ${hotlist_priority_number}: -1 = keine, 0 = niedrig, 1 = Nachricht, 2 "
+"= private, 3 = Hervorhebungen\n"
 "    - ${format_lag}: die Verzögerung für einen IRC Server-Buffer, ist leer "
 "falls es keine Verzögerung gibt (evaluiert aus Option buflist.format.lag)\n"
 "    - ${format_tls_version}: Indikator der TLS Version für den Serverbuffer, "
@@ -8302,8 +8286,8 @@ msgstr "%s%s: DCC kann nicht erstellt werden"
 msgid ""
 "%s%s: unable to create DCC, please check that the \"xfer\" plugin is loaded"
 msgstr ""
-"%s%s: DCC kann nicht erstellt werden, bitte überprüfen Sie, ob das"
-" \"xfer\"-Erweiterung geladen ist"
+"%s%s: DCC kann nicht erstellt werden, bitte überprüfen Sie, ob das \"xfer\"-"
+"Erweiterung geladen ist"
 
 #, c-format
 msgid "%s%s: not connected to server \"%s\"!"
@@ -8875,27 +8859,6 @@ msgstr "Aushandlung der Clientfähigkeit"
 msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr "ls || list || req|ack [<capability> [<capability>...]] || end"
 
-#| msgid ""
-#| "   ls: list the capabilities supported by the server\n"
-#| " list: list the capabilities currently enabled\n"
-#| "  req: request a capability\n"
-#| "  ack: acknowledge capabilities which require client-side "
-#| "acknowledgement\n"
-#| "  end: end the capability negotiation\n"
-#| "\n"
-#| "Without argument, \"ls\" and \"list\" are sent.\n"
-#| "\n"
-#| "Capabilities supported by WeeChat are: account-notify, away-notify, cap-"
-#| "notify, chghost, extended-join, invite-notify, message-tags, multi-"
-#| "prefix, server-time, setname, userhost-in-names.\n"
-#| "\n"
-#| "The capabilities to automatically enable on servers can be set in option "
-#| "irc.server_default.capabilities (or by server in option irc.server.xxx."
-#| "capabilities).\n"
-#| "\n"
-#| "Examples:\n"
-#| "   /cap\n"
-#| "   /cap req multi-prefix away-notify"
 msgid ""
 "   ls: list the capabilities supported by the server\n"
 " list: list the capabilities currently enabled\n"
@@ -15474,8 +15437,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
 
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
@@ -15483,14 +15445,109 @@ msgid ""
 "monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
 "<name>|-all [<name>...] || restore <name> [<name>...] || default -yes || "
 "monitor [<filter>]"
 
+#, fuzzy
+#| msgid ""
+#| "       list: list triggers (without argument, this list is displayed)\n"
+#| "   listfull: list triggers with detailed info for each trigger\n"
+#| "listdefault: list default triggers\n"
+#| "        add: add a trigger\n"
+#| "     addoff: add a trigger (disabled)\n"
+#| " addreplace: add or replace an existing trigger\n"
+#| "       name: name of trigger\n"
+#| "       hook: signal, hsignal, modifier, line, print, command, "
+#| "command_run, timer, config, focus, info, info_hashtable\n"
+#| "  arguments: arguments for the hook, depending on hook (separated by "
+#| "semicolons):\n"
+#| "             signal: name(s) of signal (required)\n"
+#| "             hsignal: name(s) of hsignal (required)\n"
+#| "             modifier: name(s) of modifier (required)\n"
+#| "             line: buffer type (\"formatted\", \"free\" or \"*\"), list "
+#| "of buffer masks, tags\n"
+#| "             print: buffer, tags, message, strip colors\n"
+#| "             command: command (required), description, arguments, "
+#| "description of arguments, completion (all arguments except command are "
+#| "evaluated, \"${tg_trigger_name}\" is replaced by the trigger name, see /"
+#| "help eval)\n"
+#| "             command_run: command(s) (required)\n"
+#| "             timer: interval (required), align on second, max calls\n"
+#| "             config: name(s) of option (required)\n"
+#| "             focus: name(s) of area (required)\n"
+#| "             info: name(s) of info (required)\n"
+#| "             info_hashtable: name(s) of info (required)\n"
+#| " conditions: evaluated conditions for the trigger\n"
+#| "      regex: one or more regular expressions to replace strings in "
+#| "variables\n"
+#| "    command: command to execute (many commands can be separated by \";"
+#| "\")\n"
+#| "return_code: return code in callback (ok (default), ok_eat, error)\n"
+#| "post_action: action to take after execution (none (default), disable, "
+#| "delete)\n"
+#| "   addinput: set input with default arguments to create a trigger\n"
+#| "      input: set input with the command used to create the trigger\n"
+#| "     output: send the command to create the trigger on the buffer\n"
+#| "   recreate: same as \"input\", with option \"addreplace\" instead of "
+#| "\"add\"\n"
+#| "        set: set an option in a trigger\n"
+#| "     option: name of option: name, hook, arguments, conditions, regex, "
+#| "command, return_code\n"
+#| "             (for help on option, you can type: /help trigger.trigger."
+#| "<name>.<option>)\n"
+#| "      value: new value for the option\n"
+#| "     rename: rename a trigger\n"
+#| "       copy: copy a trigger\n"
+#| "     enable: enable trigger(s) (without arguments: enable triggers "
+#| "globally)\n"
+#| "    disable: disable trigger(s) (without arguments: disable triggers "
+#| "globally)\n"
+#| "     toggle: toggle trigger(s) (without arguments: toggle triggers "
+#| "globally)\n"
+#| "    restart: restart trigger(s) (recreate the hooks)\n"
+#| "       show: show detailed info on a trigger (with some stats)\n"
+#| "        del: delete a trigger\n"
+#| "       -all: do action on all triggers\n"
+#| "    restore: restore trigger(s) with the default values (works only for "
+#| "default triggers)\n"
+#| "    default: delete all triggers and restore default ones\n"
+#| "    monitor: open the trigger monitor buffer, with optional filter:\n"
+#| "     filter: filter hooks/triggers to display (a hook must start with "
+#| "\"@\", for example \"@signal\"), many filters can be separated by commas; "
+#| "wildcard \"*\" is allowed in each trigger name\n"
+#| "\n"
+#| "When a trigger callback is called, following actions are performed, in "
+#| "this order:\n"
+#| "  1. check conditions; if false, exit\n"
+#| "  2. replace text using POSIX extended regular expression(s) (if defined "
+#| "in trigger)\n"
+#| "  3. execute command(s) (if defined in trigger)\n"
+#| "  4. exit with a return code (except for modifier, line, focus, info and "
+#| "info_hashtable)\n"
+#| "  5. perform post action\n"
+#| "\n"
+#| "Examples (you can also look at default triggers with /trigger "
+#| "listdefault):\n"
+#| "  add text attributes *bold*, _underline_ and /italic/ (only in user "
+#| "messages):\n"
+#| "    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" "
+#| "\"==\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== "
+#| "==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/"
+#| "==/${color:italic}${re:1}${color:-italic}/\"\n"
+#| "  hide nicklist bar on small terminals:\n"
+#| "    /trigger add resize_small signal signal_sigwinch \"${info:term_width} "
+#| "< 100\" \"\" \"/bar hide nicklist\"\n"
+#| "    /trigger add resize_big signal signal_sigwinch \"${info:term_width} "
+#| ">= 100\" \"\" \"/bar show nicklist\"\n"
+#| "  silently save config each hour:\n"
+#| "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+#| "  open trigger monitor and show only modifiers and triggers whose name "
+#| "starts with \"resize\":\n"
+#| "    /trigger monitor @modifier,resize*"
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -15581,6 +15638,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -16373,3 +16433,8 @@ 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)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "WeeChat-Version"
diff --git a/po/es.po b/po/es.po
index 1f49576e6..7697743a2 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-06-18 16:11+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1042,6 +1042,16 @@ msgstr "%sNo esta permitido reiniciar todas las opciones"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d opción(es) reiniciada(s), %d opción(es) removida(s)"
 
+#, fuzzy, c-format
+#| msgid "%sUnable to save session in file"
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sError: no se pudo guardar la sesión"
+
+#, fuzzy
+#| msgid "%sUnable to save session in file"
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sError: no se pudo guardar la sesión"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1069,10 +1079,6 @@ msgstr "%sNingún ejecutable especificado"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Actualizando WeeChat con el archivo binario: \"%s\"..."
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sError: no se pudo guardar la sesión"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "***** Error: el ejecutable falló (programa: \"%s\"), cerrando WeeChat"
@@ -3067,10 +3073,16 @@ msgstr ""
 "  reiniciar todas las opciones de colores:\n"
 "    /unset weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+#, fuzzy
+#| msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "reiniciar WeeChat sin desconectarse de los servidores"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<ruta_al_ejecutable>|-quit]"
 
 #, fuzzy
@@ -3080,6 +3092,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3087,9 +3102,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3097,15 +3117,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -13520,6 +13547,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -14157,3 +14187,8 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse: error (%d)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "versión de WeeChat"
diff --git a/po/fr.po b/po/fr.po
index c1f2a58b0..49601ee78 100644
--- 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: 2022-08-03 16:55+0200\n"
-"PO-Revision-Date: 2022-08-03 21:17+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
+"PO-Revision-Date: 2022-08-07 16:40+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1006,6 +1006,13 @@ msgstr "%sLa réinitialisation de toutes les options n'est pas autorisée"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d option(s) réinitialisée(s), %d option(s) supprimée(s)"
 
+#, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sImpossible de sauvegarder la session WeeChat (fichiers *.upgrade)"
+
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "Session WeeChat sauvegardée (fichiers *.upgrade)"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1033,10 +1040,6 @@ msgstr "%sPas de binaire spécifié"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Mise à jour de WeeChat avec le fichier binaire : \"%s\"..."
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sImpossible de sauvegarder la session dans le fichier"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "***** Erreur : exec a échoué (programme : \"%s\"), sortie de WeeChat"
@@ -3256,11 +3259,15 @@ msgstr ""
 "  réinitialiser toutes les options de couleur :\n"
 "    /unset -mask weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
-msgstr "relancer le binaire WeeChat sans se déconnecter des serveurs"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
+msgstr ""
+"sauvegarder la session WeeChat et relancer le binaire WeeChat sans se "
+"déconnecter des serveurs"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
-msgstr "[-yes] [<chemin_vers_binaire>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgstr "[-yes] [<chemin_vers_binaire>|-save|-quit]"
 
 msgid ""
 "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
@@ -3268,6 +3275,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3275,9 +3285,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3285,15 +3300,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -3303,8 +3325,12 @@ msgstr ""
 "courant)\n"
 "             -dummy : ne rien faire (option utilisée pour éviter une "
 "complétion accidentelle avec \"-quit\")\n"
-"              -quit : fermer *TOUTES* les connexions, sauver la session et "
-"quitter, ce qui rend possible une restauration différée (voir ci-dessous)\n"
+"              -save : sauvegarder seulement la session, ne pas quitter ni "
+"relancer WeeChat ; les fichiers de configuration ne sont pas sauvegardés (si "
+"besoin vous pouvez utiliser /save avant cette commande)\n"
+"              -quit : fermer *TOUTES* les connexions, sauvegarder la session "
+"et quitter, ce qui rend possible une restauration différée (voir ci-"
+"dessous)\n"
 "\n"
 "Cette commande met à jour et recharge une session de WeeChat qui tourne. Le "
 "nouveau binaire WeeChat doit avoir été compilé ou installé via un "
@@ -3314,6 +3340,12 @@ msgstr ""
 "rechargement de session SSL n'est pas possible actuellement avec GnuTLS. Il "
 "y a une reconnexion automatique après la mise à jour.\n"
 "\n"
+"Important : l'utilisation de l'option -save peut être dangereuse, il est "
+"recommandé d'utiliser seulement /upgrade (ou avec -quit) pour une mise à "
+"jour standard et un redémarrage ; l'option -save peut être utilisée pour "
+"sauvegarder régulièrement la session et la restaurer en cas de sortie "
+"anormale (panne de courant, crash, etc.).\n"
+"\n"
 "Le processus de mise à jour comporte 4 étapes :\n"
 "  1. sauvegarder la session pour le cœur et les extensions (tampons, "
 "historique, ...)\n"
@@ -3322,16 +3354,23 @@ msgstr ""
 "  3. sauvegarder la configuration WeeChat (weechat.conf)\n"
 "  4. exécuter le nouveau binaire WeeChat et recharger la session.\n"
 "\n"
-"Avec l'option \"-quit\", le processus est légèrement différent :\n"
+"Avec l'option \"-quit\", le processus est le suivant :\n"
 "  1. fermer *TOUTES* les connexions\n"
 "  2. sauvegarder la session (fichiers *.upgrade)\n"
 "  3. décharger les extensions\n"
 "  4. sauvegarder la configuration WeeChat\n"
 "  5. quitter WeeChat\n"
-"Et plus tard vous pouvez restaurer la session avec la commande : weechat --"
-"upgrade\n"
+"\n"
+"Avec l'option \"-save\", le processus est le suivant :\n"
+"  1. sauvegarder la session (fichiers *.upgrade) avec un état déconnecté "
+"pour les serveurs IRC et les clients Relay (mais aucune déconnexion n'est "
+"faite)\n"
+"\n"
+"Avec \"-quit\" ou \"-save\", vous pouvez restaurer la session plus tard avec "
+"cette commande : weechat --upgrade\n"
 "IMPORTANT : vous devez restaurer la session avec exactement la même "
-"configuration (fichiers *.conf).\n"
+"configuration (fichiers *.conf) et si possible la même version de WeeChat "
+"(ou une plus récente).\n"
 "Il est également possible de restaurer la session WeeChat sur une autre "
 "machine si vous y copiez le contenu des répertoires personnels de WeeChat "
 "(voir /debug dirs)."
@@ -15165,6 +15204,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -15266,8 +15308,11 @@ msgstr ""
 "100\" \"\" \"/bar hide nicklist\"\n"
 "    /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
 "100\" \"\" \"/bar show nicklist\"\n"
-"  sauver la configuration chaque heure (de manière silencieuse) :\n"
+"  sauver silencieusement la configuration chaque heure :\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  sauver silencieusement la session WeeChat à minuit (voir /help upgrade) :\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  ouvrir le tampon moniteur des triggers et afficher seulement les "
 "modificateurs et les triggers dont le nom commence par \"resize\" :\n"
 "    /trigger monitor @modifier,resize*"
@@ -15958,3 +16003,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 "WeeChat session saved"
+#~ msgstr "Session WeeChat sauvegardée"
diff --git a/po/hu.po b/po/hu.po
index 8ee413027..30b36f8b6 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-04-24 10:20+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -988,6 +988,14 @@ msgstr ""
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%s nem sikerült a folyamatot menteni\n"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%s nem sikerült a folyamatot menteni\n"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1011,10 +1019,6 @@ msgstr "Nincs aliasz definiálva.\n"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "WeeChat frissítése...\n"
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%s nem sikerült a folyamatot menteni\n"
-
 #, fuzzy, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "%s futtatási hiba (program: \"%s\"), a WeeChat kilép\n"
@@ -2332,11 +2336,13 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "WeeChat frissítése a szerverekről való lecsatlakozás nélkül"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[path_to_binary]"
 
 #, fuzzy
@@ -2346,6 +2352,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -2353,9 +2362,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -2363,15 +2377,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -12279,6 +12300,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -12915,3 +12939,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 "WeeChat session saved"
+#~ msgstr "WeeChat szlogen"
diff --git a/po/it.po b/po/it.po
index ab2eb2bbd..faeb68b60 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-04-24 10:20+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -969,6 +969,14 @@ msgstr "%sIl ripristino di tutte le opzioni non è consentito"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d opzione(i) ripristinata(e), %d opzione(i) rimossa(e)"
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sErrore: impossibile salvare la sessione su file"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sErrore: impossibile salvare la sessione su file"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -996,10 +1004,6 @@ msgstr "Nessuna barra definita"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Aggiornamento di WeeChat con il file binario: \"%s\"..."
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sErrore: impossibile salvare la sessione su file"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "***** Errore: exec fallito (programma: \"%s\"), chiusura di WeeChat"
@@ -2742,11 +2746,13 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "aggiorna WeeChat senza disconnettere dai server"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[<path_del_binario>|-quit]"
 
 #, fuzzy
@@ -2756,6 +2762,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -2763,9 +2772,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -2773,15 +2787,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -13349,6 +13370,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -13981,3 +14005,8 @@ 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"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "versione di WeeChat"
diff --git a/po/ja.po b/po/ja.po
index df98bc7ea..ea6c5dc36 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-06-18 16:12+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -1001,6 +1001,14 @@ msgstr "%s全てのオプションをリセットすることは出来ません"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d 個のオプションがリセットされ、%d 個のオプションが削除されました"
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sエラー: ファイルにセッションを保存できません"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sエラー: ファイルにセッションを保存できません"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1027,10 +1035,6 @@ msgstr "%sバイナリが指定されていません"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "バイナリファイル: \"%s\" で WeeChat のアップグレード中..."
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sエラー: ファイルにセッションを保存できません"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "***** エラー: 実行失敗 (プログラム: \"%s\")、WeeChat を終了しています"
@@ -3136,10 +3140,16 @@ msgstr ""
 "  全ての色関連オプションをリセット:\n"
 "    /unset -mask weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+#, fuzzy
+#| msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "サーバとの接続を維持して WeeChat 実行バイナリを再読込"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<path_to_binary>|-quit]"
 
 #, fuzzy
@@ -3149,6 +3159,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3156,9 +3169,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3166,15 +3184,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -14468,6 +14493,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -15182,3 +15210,8 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "WeeChat のバージョン"
diff --git a/po/pl.po b/po/pl.po
index b97c91da1..2076d47ec 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-06-18 16:12+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -1020,6 +1020,16 @@ msgstr "%sResetowanie wszystkich opcji jest niedozwolone"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "zresetowano %d opcje, usunięto %d opcje"
 
+#, fuzzy, c-format
+#| msgid "%sUnable to save session in file"
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sNie można zapisać sesji w pliku"
+
+#, fuzzy
+#| msgid "%sUnable to save session in file"
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sNie można zapisać sesji w pliku"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1047,10 +1057,6 @@ msgstr "%sNie określono binarki"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Uaktualniam WeeChat z użyciem pliku: \"%s\"..."
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sNie można zapisać sesji w pliku"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -3350,18 +3356,63 @@ msgstr ""
 "  resetowanie wszystkich opcji dotyczących kolorów:\n"
 "    /unset weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+#, fuzzy
+#| msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "przeładowanie pliku binarnego WeeChat bez rozłączania z serwerami"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<ścieżka_do_binarki>|-quit]"
 
+#, fuzzy
+#| msgid ""
+#| "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
+#| "enabled\n"
+#| "path_to_binary: path to WeeChat binary (default is current binary)\n"
+#| "        -dummy: do nothing (option used to prevent accidental completion "
+#| "with \"-quit\")\n"
+#| "         -quit: close *ALL* connections, save session and quit WeeChat, "
+#| "which makes possible a delayed restoration (see below)\n"
+#| "\n"
+#| "This command upgrades and reloads a running WeeChat session. The new "
+#| "WeeChat binary must have been compiled or installed with a package "
+#| "manager before running this command.\n"
+#| "\n"
+#| "Note: SSL connections are lost during upgrade, because reload of SSL "
+#| "sessions is currently not possible with GnuTLS. There is automatic "
+#| "reconnection after upgrade.\n"
+#| "\n"
+#| "Upgrade process has 4 steps:\n"
+#| "  1. save session into files for core and plugins (buffers, history, ..)\n"
+#| "  2. unload all plugins (configuration files (*.conf) are written on "
+#| "disk)\n"
+#| "  3. save WeeChat configuration (weechat.conf)\n"
+#| "  4. execute new WeeChat binary and reload session.\n"
+#| "\n"
+#| "With option \"-quit\", the process is slightly different:\n"
+#| "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
+#| "  2. save session into files (*.upgrade)\n"
+#| "  3. unload all plugins\n"
+#| "  4. save WeeChat configuration\n"
+#| "  5. quit WeeChat\n"
+#| "Then later you can restore session with command: weechat --upgrade\n"
+#| "IMPORTANT: you must restore the session with exactly same configuration "
+#| "(files *.conf).\n"
+#| "It is possible to restore WeeChat session on another machine if you copy "
+#| "the content of WeeChat home directories (see /debug dirs)."
 msgid ""
 "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
 "enabled\n"
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3369,9 +3420,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3379,15 +3435,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -14966,6 +15029,102 @@ msgstr ""
 "<nazwa> || del <nazwa>|-all [<nazwa>...] || restore <nazwa> [<nazwa>...] || "
 "default -yes || monitor [<filtr>]"
 
+#, fuzzy
+#| msgid ""
+#| "       list: list triggers (without argument, this list is displayed)\n"
+#| "   listfull: list triggers with detailed info for each trigger\n"
+#| "listdefault: list default triggers\n"
+#| "        add: add a trigger\n"
+#| "     addoff: add a trigger (disabled)\n"
+#| " addreplace: add or replace an existing trigger\n"
+#| "       name: name of trigger\n"
+#| "       hook: signal, hsignal, modifier, line, print, command, "
+#| "command_run, timer, config, focus, info, info_hashtable\n"
+#| "  arguments: arguments for the hook, depending on hook (separated by "
+#| "semicolons):\n"
+#| "             signal: name(s) of signal (required)\n"
+#| "             hsignal: name(s) of hsignal (required)\n"
+#| "             modifier: name(s) of modifier (required)\n"
+#| "             line: buffer type (\"formatted\", \"free\" or \"*\"), list "
+#| "of buffer masks, tags\n"
+#| "             print: buffer, tags, message, strip colors\n"
+#| "             command: command (required), description, arguments, "
+#| "description of arguments, completion (all arguments except command are "
+#| "evaluated, \"${tg_trigger_name}\" is replaced by the trigger name, see /"
+#| "help eval)\n"
+#| "             command_run: command(s) (required)\n"
+#| "             timer: interval (required), align on second, max calls\n"
+#| "             config: name(s) of option (required)\n"
+#| "             focus: name(s) of area (required)\n"
+#| "             info: name(s) of info (required)\n"
+#| "             info_hashtable: name(s) of info (required)\n"
+#| " conditions: evaluated conditions for the trigger\n"
+#| "      regex: one or more regular expressions to replace strings in "
+#| "variables\n"
+#| "    command: command to execute (many commands can be separated by \";"
+#| "\")\n"
+#| "return_code: return code in callback (ok (default), ok_eat, error)\n"
+#| "post_action: action to take after execution (none (default), disable, "
+#| "delete)\n"
+#| "   addinput: set input with default arguments to create a trigger\n"
+#| "      input: set input with the command used to create the trigger\n"
+#| "     output: send the command to create the trigger on the buffer\n"
+#| "   recreate: same as \"input\", with option \"addreplace\" instead of "
+#| "\"add\"\n"
+#| "        set: set an option in a trigger\n"
+#| "     option: name of option: name, hook, arguments, conditions, regex, "
+#| "command, return_code\n"
+#| "             (for help on option, you can type: /help trigger.trigger."
+#| "<name>.<option>)\n"
+#| "      value: new value for the option\n"
+#| "     rename: rename a trigger\n"
+#| "       copy: copy a trigger\n"
+#| "     enable: enable trigger(s) (without arguments: enable triggers "
+#| "globally)\n"
+#| "    disable: disable trigger(s) (without arguments: disable triggers "
+#| "globally)\n"
+#| "     toggle: toggle trigger(s) (without arguments: toggle triggers "
+#| "globally)\n"
+#| "    restart: restart trigger(s) (recreate the hooks)\n"
+#| "       show: show detailed info on a trigger (with some stats)\n"
+#| "        del: delete a trigger\n"
+#| "       -all: do action on all triggers\n"
+#| "    restore: restore trigger(s) with the default values (works only for "
+#| "default triggers)\n"
+#| "    default: delete all triggers and restore default ones\n"
+#| "    monitor: open the trigger monitor buffer, with optional filter:\n"
+#| "     filter: filter hooks/triggers to display (a hook must start with "
+#| "\"@\", for example \"@signal\"), many filters can be separated by commas; "
+#| "wildcard \"*\" is allowed in each trigger name\n"
+#| "\n"
+#| "When a trigger callback is called, following actions are performed, in "
+#| "this order:\n"
+#| "  1. check conditions; if false, exit\n"
+#| "  2. replace text using POSIX extended regular expression(s) (if defined "
+#| "in trigger)\n"
+#| "  3. execute command(s) (if defined in trigger)\n"
+#| "  4. exit with a return code (except for modifier, line, focus, info and "
+#| "info_hashtable)\n"
+#| "  5. perform post action\n"
+#| "\n"
+#| "Examples (you can also look at default triggers with /trigger "
+#| "listdefault):\n"
+#| "  add text attributes *bold*, _underline_ and /italic/ (only in user "
+#| "messages):\n"
+#| "    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" "
+#| "\"==\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== "
+#| "==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/"
+#| "==/${color:italic}${re:1}${color:-italic}/\"\n"
+#| "  hide nicklist bar on small terminals:\n"
+#| "    /trigger add resize_small signal signal_sigwinch \"${info:term_width} "
+#| "< 100\" \"\" \"/bar hide nicklist\"\n"
+#| "    /trigger add resize_big signal signal_sigwinch \"${info:term_width} "
+#| ">= 100\" \"\" \"/bar show nicklist\"\n"
+#| "  silently save config each hour:\n"
+#| "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+#| "  open trigger monitor and show only modifiers and triggers whose name "
+#| "starts with \"resize\":\n"
+#| "    /trigger monitor @modifier,resize*"
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -15056,6 +15215,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -15811,3 +15973,8 @@ 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)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "Wersja WeeChat"
diff --git a/po/pt.po b/po/pt.po
index 9ea3b67c5..5f20c79bb 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-06-18 16:12+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -992,6 +992,14 @@ msgstr "%sNão é permitido repor todas as opções"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d opções repostas, %d opções removidas"
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sErro: não foi possível guardar a sessão no ficheiro"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sErro: não foi possível guardar a sessão no ficheiro"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1019,10 +1027,6 @@ msgstr "%sNenhum binário especificado"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "A atualizar o WeeChat com o ficheiro binário: \"%s\"..."
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sErro: não foi possível guardar a sessão no ficheiro"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -3129,10 +3133,14 @@ msgstr ""
 "    /unset -mask weechat.color.*"
 
 #, fuzzy
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "atualizar o WeeChat sem desconectar dos servidores"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<binário>|-quit]"
 
 #, fuzzy
@@ -3142,6 +3150,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3149,9 +3160,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3159,15 +3175,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -14296,6 +14319,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -15028,3 +15054,8 @@ 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)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "versão do WeeChat"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 11b9235bb..e10bb9517 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-04-24 10:20+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1002,6 +1002,14 @@ msgstr "%sRestauração de todas as opções não é permitida"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d opção(ões) restaurada(s), %d opção(ões) removidas"
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sErro: incapaz de salvar a sessão em arquivo"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sErro: incapaz de salvar a sessão em arquivo"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1029,10 +1037,6 @@ msgstr "Nenhuma barra definida"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Atualizando WeeChat com o arquivo binário: \"%s\"..."
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sErro: incapaz de salvar a sessão em arquivo"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "***** Erro: exec falhou (programa: \"%s\"), saindo do WeeChat"
@@ -2801,11 +2805,13 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "atualiza o WeeChat sem desconectar dos servidores"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[<caminho_para_o_binário>|-quit]"
 
 #, fuzzy
@@ -2815,6 +2821,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -2822,9 +2831,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -2832,15 +2846,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -12803,6 +12824,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -13432,3 +13456,8 @@ 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"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "versão do WeeChat"
diff --git a/po/ru.po b/po/ru.po
index 95edca38f..1fa8cc62c 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-04-24 10:20+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1008,6 +1008,14 @@ msgstr "%sСброс всех опций запрещён"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d опция сброшено, %d опций удалено"
 
+#, fuzzy, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%s не могу сохранить сессию в файл\n"
+
+#, fuzzy
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%s не могу сохранить сессию в файл\n"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1031,10 +1039,6 @@ msgstr "Сокращения не заданы.\n"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Обновляю WeeChat...\n"
 
-#, fuzzy, c-format
-msgid "%sUnable to save session in file"
-msgstr "%s не могу сохранить сессию в файл\n"
-
 #, fuzzy, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr "%s запуск не удался (программа: \"%s\"), выхожу из WeeChat\n"
@@ -2354,11 +2358,13 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "обновить WeeChat не отключаясь от серверов"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[путь_к_исполняемому_файлу]"
 
 #, fuzzy
@@ -2368,6 +2374,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -2375,9 +2384,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -2385,15 +2399,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -12316,6 +12337,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -12949,3 +12973,7 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
+
+#, fuzzy
+#~ msgid "WeeChat session saved"
+#~ msgstr "слоган WeeChat"
diff --git a/po/sr.po b/po/sr.po
index 8a6f617f8..267213ca4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-07-06 08:29+0400\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -999,6 +999,16 @@ msgstr "%sНије дозвољено ресетовање свих опција
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d опција је ресетовано, %d опција је уклоњено"
 
+#, fuzzy, c-format
+#| msgid "%sUnable to save session in file"
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sНије могуће чување сесије у фајл"
+
+#, fuzzy
+#| msgid "%sUnable to save session in file"
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sНије могуће чување сесије у фајл"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1025,10 +1035,6 @@ msgstr "%sНије наведен бинарни фајл"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "WeeChat се ажурира са бинарним фајлом: „%s”..."
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sНије могуће чување сесије у фајл"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -3202,19 +3208,64 @@ msgstr ""
 "  ресетовање свих опција боја:\n"
 "    /unset -mask weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+#, fuzzy
+#| msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr ""
 "поновно учитавање WeeChat бинарног фајла без прекидања конекције са серверима"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<путања_до_бинарног>|-quit]"
 
+#, fuzzy
+#| msgid ""
+#| "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
+#| "enabled\n"
+#| "path_to_binary: path to WeeChat binary (default is current binary)\n"
+#| "        -dummy: do nothing (option used to prevent accidental completion "
+#| "with \"-quit\")\n"
+#| "         -quit: close *ALL* connections, save session and quit WeeChat, "
+#| "which makes possible a delayed restoration (see below)\n"
+#| "\n"
+#| "This command upgrades and reloads a running WeeChat session. The new "
+#| "WeeChat binary must have been compiled or installed with a package "
+#| "manager before running this command.\n"
+#| "\n"
+#| "Note: SSL connections are lost during upgrade, because reload of SSL "
+#| "sessions is currently not possible with GnuTLS. There is automatic "
+#| "reconnection after upgrade.\n"
+#| "\n"
+#| "Upgrade process has 4 steps:\n"
+#| "  1. save session into files for core and plugins (buffers, history, ..)\n"
+#| "  2. unload all plugins (configuration files (*.conf) are written on "
+#| "disk)\n"
+#| "  3. save WeeChat configuration (weechat.conf)\n"
+#| "  4. execute new WeeChat binary and reload session.\n"
+#| "\n"
+#| "With option \"-quit\", the process is slightly different:\n"
+#| "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
+#| "  2. save session into files (*.upgrade)\n"
+#| "  3. unload all plugins\n"
+#| "  4. save WeeChat configuration\n"
+#| "  5. quit WeeChat\n"
+#| "Then later you can restore session with command: weechat --upgrade\n"
+#| "IMPORTANT: you must restore the session with exactly same configuration "
+#| "(files *.conf).\n"
+#| "It is possible to restore WeeChat session on another machine if you copy "
+#| "the content of WeeChat home directories (see /debug dirs)."
 msgid ""
 "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
 "enabled\n"
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3222,9 +3273,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3232,15 +3288,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -14809,6 +14872,102 @@ msgstr ""
 "all [<име>...] || restore <име> [<име>...] || default -yes || monitor "
 "[<филтер>]"
 
+#, fuzzy
+#| msgid ""
+#| "       list: list triggers (without argument, this list is displayed)\n"
+#| "   listfull: list triggers with detailed info for each trigger\n"
+#| "listdefault: list default triggers\n"
+#| "        add: add a trigger\n"
+#| "     addoff: add a trigger (disabled)\n"
+#| " addreplace: add or replace an existing trigger\n"
+#| "       name: name of trigger\n"
+#| "       hook: signal, hsignal, modifier, line, print, command, "
+#| "command_run, timer, config, focus, info, info_hashtable\n"
+#| "  arguments: arguments for the hook, depending on hook (separated by "
+#| "semicolons):\n"
+#| "             signal: name(s) of signal (required)\n"
+#| "             hsignal: name(s) of hsignal (required)\n"
+#| "             modifier: name(s) of modifier (required)\n"
+#| "             line: buffer type (\"formatted\", \"free\" or \"*\"), list "
+#| "of buffer masks, tags\n"
+#| "             print: buffer, tags, message, strip colors\n"
+#| "             command: command (required), description, arguments, "
+#| "description of arguments, completion (all arguments except command are "
+#| "evaluated, \"${tg_trigger_name}\" is replaced by the trigger name, see /"
+#| "help eval)\n"
+#| "             command_run: command(s) (required)\n"
+#| "             timer: interval (required), align on second, max calls\n"
+#| "             config: name(s) of option (required)\n"
+#| "             focus: name(s) of area (required)\n"
+#| "             info: name(s) of info (required)\n"
+#| "             info_hashtable: name(s) of info (required)\n"
+#| " conditions: evaluated conditions for the trigger\n"
+#| "      regex: one or more regular expressions to replace strings in "
+#| "variables\n"
+#| "    command: command to execute (many commands can be separated by \";"
+#| "\")\n"
+#| "return_code: return code in callback (ok (default), ok_eat, error)\n"
+#| "post_action: action to take after execution (none (default), disable, "
+#| "delete)\n"
+#| "   addinput: set input with default arguments to create a trigger\n"
+#| "      input: set input with the command used to create the trigger\n"
+#| "     output: send the command to create the trigger on the buffer\n"
+#| "   recreate: same as \"input\", with option \"addreplace\" instead of "
+#| "\"add\"\n"
+#| "        set: set an option in a trigger\n"
+#| "     option: name of option: name, hook, arguments, conditions, regex, "
+#| "command, return_code\n"
+#| "             (for help on option, you can type: /help trigger.trigger."
+#| "<name>.<option>)\n"
+#| "      value: new value for the option\n"
+#| "     rename: rename a trigger\n"
+#| "       copy: copy a trigger\n"
+#| "     enable: enable trigger(s) (without arguments: enable triggers "
+#| "globally)\n"
+#| "    disable: disable trigger(s) (without arguments: disable triggers "
+#| "globally)\n"
+#| "     toggle: toggle trigger(s) (without arguments: toggle triggers "
+#| "globally)\n"
+#| "    restart: restart trigger(s) (recreate the hooks)\n"
+#| "       show: show detailed info on a trigger (with some stats)\n"
+#| "        del: delete a trigger\n"
+#| "       -all: do action on all triggers\n"
+#| "    restore: restore trigger(s) with the default values (works only for "
+#| "default triggers)\n"
+#| "    default: delete all triggers and restore default ones\n"
+#| "    monitor: open the trigger monitor buffer, with optional filter:\n"
+#| "     filter: filter hooks/triggers to display (a hook must start with "
+#| "\"@\", for example \"@signal\"), many filters can be separated by commas; "
+#| "wildcard \"*\" is allowed in each trigger name\n"
+#| "\n"
+#| "When a trigger callback is called, following actions are performed, in "
+#| "this order:\n"
+#| "  1. check conditions; if false, exit\n"
+#| "  2. replace text using POSIX extended regular expression(s) (if defined "
+#| "in trigger)\n"
+#| "  3. execute command(s) (if defined in trigger)\n"
+#| "  4. exit with a return code (except for modifier, line, focus, info and "
+#| "info_hashtable)\n"
+#| "  5. perform post action\n"
+#| "\n"
+#| "Examples (you can also look at default triggers with /trigger "
+#| "listdefault):\n"
+#| "  add text attributes *bold*, _underline_ and /italic/ (only in user "
+#| "messages):\n"
+#| "    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" "
+#| "\"==\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== "
+#| "==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/"
+#| "==/${color:italic}${re:1}${color:-italic}/\"\n"
+#| "  hide nicklist bar on small terminals:\n"
+#| "    /trigger add resize_small signal signal_sigwinch \"${info:term_width} "
+#| "< 100\" \"\" \"/bar hide nicklist\"\n"
+#| "    /trigger add resize_big signal signal_sigwinch \"${info:term_width} "
+#| ">= 100\" \"\" \"/bar show nicklist\"\n"
+#| "  silently save config each hour:\n"
+#| "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+#| "  open trigger monitor and show only modifiers and triggers whose name "
+#| "starts with \"resize\":\n"
+#| "    /trigger monitor @modifier,resize*"
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -14899,6 +15058,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -15653,3 +15815,8 @@ msgstr "%s%s: тајмаут за „%s” са %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "верзија програма WeeChat"
diff --git a/po/tr.po b/po/tr.po
index 6767441f3..fa11b9a92 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\n"
 "PO-Revision-Date: 2022-07-27 23:00+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -988,6 +988,16 @@ msgstr "%sTüm seçeneklerin sıfırlanmasına izin verilmiyor"
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr "%d seçenek sıfırlandı, %d seçenek kaldırıldı"
 
+#, fuzzy, c-format
+#| msgid "%sUnable to save session in file"
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr "%sOturum dosyaya kaydedilemiyor"
+
+#, fuzzy
+#| msgid "%sUnable to save session in file"
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr "%sOturum dosyaya kaydedilemiyor"
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1014,10 +1024,6 @@ msgstr "%sBir ikili belirtilmemiş"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "WeeChat ikili dosya ile yükseltiliyor: \"%s\"..."
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr "%sOturum dosyaya kaydedilemiyor"
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -1326,8 +1332,8 @@ msgstr ""
 "  numara: Arabelleğe atla (numara ile), olası önek:\n"
 "          '+': göreli atlama, geçerliye numara ekle\n"
 "          '-': göreli atlama, geçerliden numara çıkar\n"
-"          '*': numaraya atla, \"weechat.look.jump_current_to_previous_buffer"
-"\"\n"
+"          '*': numaraya atla, \"weechat.look."
+"jump_current_to_previous_buffer\"\n"
 "               seçeneğini kullanarak\n"
 "       -: ilk arabellek numarasına atla\n"
 "       +: son arabellek numarasına atla\n"
@@ -1450,8 +1456,8 @@ msgstr ""
 "area_left|area_right || stop"
 
 msgid ""
-"  go: move cursor to chat area, a bar (using bar name) or coordinates \"x,y"
-"\"\n"
+"  go: move cursor to chat area, a bar (using bar name) or coordinates \"x,"
+"y\"\n"
 "move: move cursor with direction\n"
 "stop: stop cursor mode\n"
 "\n"
@@ -1483,8 +1489,8 @@ msgid ""
 "  go to coordinates x=10, y=5:\n"
 "    /cursor go 10,5"
 msgstr ""
-"  go: İmleci sohbet alanına taşı, bir çubuk (çubuk adı kullanarak) veya \"x,y"
-"\"\n"
+"  go: İmleci sohbet alanına taşı, bir çubuk (çubuk adı kullanarak) veya \"x,"
+"y\"\n"
 "move: İmleci bir yöne doğru taşı\n"
 "stop: İmleç kipini durdur\n"
 "\n"
@@ -1658,12 +1664,12 @@ msgid ""
 "\"color\")\n"
 "  16. a modifier (format: \"modifier:name,data,string\")\n"
 "  17. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  18. a base 16/32/64 encoded/decoded string (format: \"base_encode:base,xxx"
-"\" or \"base_decode:base,xxx\")\n"
+"  18. a base 16/32/64 encoded/decoded string (format: \"base_encode:base,"
+"xxx\" or \"base_decode:base,xxx\")\n"
 "  19. current date/time (format: \"date\" or \"date:format\")\n"
 "  20. an environment variable (format: \"env:XXX\")\n"
-"  21. a ternary operator (format: \"if:condition?value_if_true:value_if_false"
-"\")\n"
+"  21. a ternary operator (format: \"if:condition?value_if_true:"
+"value_if_false\")\n"
 "  22. result of an expression with parentheses and operators + - * / // % ** "
 "(format: \"calc:xxx\")\n"
 "  23. a random integer number (format: \"random:min,max\")\n"
@@ -1808,8 +1814,8 @@ msgstr ""
 "  13. bir dizinin bölünmüş bir parçası (biçim: \"split:number,separators,"
 "flags,xxx\")\n"
 "  14. bir kabuk argümanının bir parçası (biçim: \"split_shell:number,xxx\")\n"
-"  15. bir renk (biçim: \"color:xxx\", bkz: \"Plugin API reference\", \"color"
-"\" işlevi)\n"
+"  15. bir renk (biçim: \"color:xxx\", bkz: \"Plugin API reference\", "
+"\"color\" işlevi)\n"
 "  16. bir değiştirici (biçim: \"modifier:name, data,string\")\n"
 "  17. bir bilgi (biçim: \"info:name,arguments\", argümanlar isteğe bağlı)\n"
 "  18. 16/32/64'lük tabanda kodlanmış dizi (biçim: \"base_encode:base,xxx\" "
@@ -1989,8 +1995,8 @@ msgstr ""
 "       del: bir süzgeci sil\n"
 "      -all: tüm süzgeçleri sil\n"
 " arabellek: süzgecin etkin olduğu arabelleklerin virgülle ayrılmış listesi:\n"
-"            - eklenti dahil olmak üzere tam ad (örnek: \"irc.libera.#weechat"
-"\" veya \"irc.server.libera\")\n"
+"            - eklenti dahil olmak üzere tam ad (örnek: \"irc.libera."
+"#weechat\" veya \"irc.server.libera\")\n"
 "            - \"*\" tüm arabellekler demektir\n"
 "            - '!' ile başlayan bir ad yok sayılır\n"
 "            - \"*\" jokerine izin verilir\n"
@@ -2244,8 +2250,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "  add item with terminal size, displayed only in buffers with number = 1:\n"
-"    /item add terminfo \"${buffer.number} == 1\" \"term:${info:term_width}x"
-"${info:term_height}\"\n"
+"    /item add terminfo \"${buffer.number} == 1\" \"term:${info:term_width}"
+"x${info:term_height}\"\n"
 "  add item with buffer info:\n"
 "    /item add bufinfo \"\" \"${buffer.number}:${buffer.name}${if:${buffer."
 "zoomed}?(Z)}\"\n"
@@ -2287,8 +2293,8 @@ msgstr ""
 "\n"
 "Examples:\n"
 "  add item with terminal size, displayed only in buffers with number = 1:\n"
-"    /item add terminfo \"${buffer.number} == 1\" \"term:${info:term_width}x"
-"${info:term_height}\"\n"
+"    /item add terminfo \"${buffer.number} == 1\" \"term:${info:term_width}"
+"x${info:term_height}\"\n"
 "  add item with buffer info:\n"
 "    /item add bufinfo \"\" \"${buffer.number}:${buffer.name}${if:${buffer."
 "zoomed}?(Z)}\"\n"
@@ -2656,8 +2662,8 @@ msgid ""
 "              time: hh:mm:ss (example: 04:32:55)\n"
 "     -tags: comma-separated list of tags (see /help filter for a list of "
 "tags most commonly used)\n"
-"      text: text to display (prefix and message must be separated by \"\\t"
-"\", if text starts with \"-\", then add a \"\\\" before)\n"
+"      text: text to display (prefix and message must be separated by "
+"\"\\t\", if text starts with \"-\", then add a \"\\\" before)\n"
 "   -stdout: display text on stdout (escaped chars are interpreted)\n"
 "   -stderr: display text on stderr (escaped chars are interpreted)\n"
 "     -beep: alias of \"-stderr \\a\"\n"
@@ -2938,8 +2944,8 @@ msgid ""
 "  set a passphrase:\n"
 "    /secure passphrase this is my passphrase\n"
 "  use program \"pass\" to read the passphrase on startup:\n"
-"    /set sec.crypt.passphrase_command \"/usr/bin/pass show weechat/passphrase"
-"\"\n"
+"    /set sec.crypt.passphrase_command \"/usr/bin/pass show weechat/"
+"passphrase\"\n"
 "  encrypt libera SASL password:\n"
 "    /secure set libera mypassword\n"
 "    /set irc.server.libera.sasl_password \"${sec.data.libera}\"\n"
@@ -3165,18 +3171,63 @@ msgstr ""
 "  tüm renk seçeneklerini sıfırla:\n"
 "    /unset -mask weechat.color.*"
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+#, fuzzy
+#| msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr "sunucu bağlantısını kesmeden WeeChat ikilisini yeniden yükle"
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+#, fuzzy
+#| msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr "[-yes] [<ikili_yolu>|-quit]"
 
+#, fuzzy
+#| msgid ""
+#| "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
+#| "enabled\n"
+#| "path_to_binary: path to WeeChat binary (default is current binary)\n"
+#| "        -dummy: do nothing (option used to prevent accidental completion "
+#| "with \"-quit\")\n"
+#| "         -quit: close *ALL* connections, save session and quit WeeChat, "
+#| "which makes possible a delayed restoration (see below)\n"
+#| "\n"
+#| "This command upgrades and reloads a running WeeChat session. The new "
+#| "WeeChat binary must have been compiled or installed with a package "
+#| "manager before running this command.\n"
+#| "\n"
+#| "Note: SSL connections are lost during upgrade, because reload of SSL "
+#| "sessions is currently not possible with GnuTLS. There is automatic "
+#| "reconnection after upgrade.\n"
+#| "\n"
+#| "Upgrade process has 4 steps:\n"
+#| "  1. save session into files for core and plugins (buffers, history, ..)\n"
+#| "  2. unload all plugins (configuration files (*.conf) are written on "
+#| "disk)\n"
+#| "  3. save WeeChat configuration (weechat.conf)\n"
+#| "  4. execute new WeeChat binary and reload session.\n"
+#| "\n"
+#| "With option \"-quit\", the process is slightly different:\n"
+#| "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
+#| "  2. save session into files (*.upgrade)\n"
+#| "  3. unload all plugins\n"
+#| "  4. save WeeChat configuration\n"
+#| "  5. quit WeeChat\n"
+#| "Then later you can restore session with command: weechat --upgrade\n"
+#| "IMPORTANT: you must restore the session with exactly same configuration "
+#| "(files *.conf).\n"
+#| "It is possible to restore WeeChat session on another machine if you copy "
+#| "the content of WeeChat home directories (see /debug dirs)."
 msgid ""
 "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
 "enabled\n"
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3184,9 +3235,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -3194,15 +3250,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -3809,14 +3872,14 @@ msgid ""
 "time format for each line displayed in buffers (see man strftime for date/"
 "time specifiers) (note: content is evaluated, so you can use colors with "
 "format \"${color:xxx}\", see /help eval); for example time using grayscale "
-"(requires support of 256 colors): \"${color:252}%H${color:245}%M"
-"${color:240}%S\""
+"(requires support of 256 colors): "
+"\"${color:252}%H${color:245}%M${color:240}%S\""
 msgstr ""
 "arabelleklerde görüntülenen her satır için zaman biçimi (tarih/zaman "
 "belirticileri için man strftime yapın) (not: içerik değerlendirilir, böylece "
 "\"${color:xxx}\" biçimiyle renk kullanabilirsiniz; bkz. /help eval); örneğin "
-"zamanı gri tonlarında göstermek için: \"${color:252}H${color:245}%M"
-"${color:240}%S\""
+"zamanı gri tonlarında göstermek için: \"${color:252}"
+"H${color:245}%M${color:240}%S\""
 
 #. TRANSLATORS: string "${color:xxx}" must NOT be translated
 msgid ""
@@ -3931,8 +3994,8 @@ msgstr ""
 "help quit)"
 
 msgid ""
-"if set, /upgrade command must be confirmed with extra argument \"-yes"
-"\" (see /help upgrade)"
+"if set, /upgrade command must be confirmed with extra argument \"-"
+"yes\" (see /help upgrade)"
 msgstr ""
 "eğer ayarlıysa /upgrade komutu ek \"-yes\" argümanıyla onaylanmalıdır (bkz. /"
 "help upgrade)"
@@ -3990,8 +4053,8 @@ msgstr ""
 msgid ""
 "comma separated list of words to highlight; case insensitive comparison (use "
 "\"(?-i)\" at beginning of words to make them case sensitive), words may "
-"begin or end with \"*\" for partial match; example: \"test,(?-i)*toto*,flash*"
-"\""
+"begin or end with \"*\" for partial match; example: \"test,(?-i)*toto*,"
+"flash*\""
 msgstr ""
 "vurgulanacak sözcüklerin virgülle ayrılmış listesi; BÜYÜK/küçük harf "
 "duyarsız karşılaştırma (duyarlı yapmak için sözcüklerin başında \"(?-i)\" "
@@ -4241,8 +4304,8 @@ msgstr ""
 "bazı takma adlar için renk zorla: renk bulmak için kullanılan takma ad "
 "sağlaması bu takma adlar için kullanılmayacaktır (biçim: \"ad1:renk1;ad2:"
 "renk2\"); takma ad araması BÜYÜK/küçük harf duyarlıdır; sonrasında bu "
-"seçenekte takma ad için küçük harf kullanılabilir; renkler \"metin,arka plan"
-"\" biçimiyle kullanılabilir; örneğin \"yellow,red\""
+"seçenekte takma ad için küçük harf kullanılabilir; renkler \"metin,arka "
+"plan\" biçimiyle kullanılabilir; örneğin \"yellow,red\""
 
 msgid ""
 "hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
@@ -4296,8 +4359,8 @@ msgstr ""
 msgid ""
 "enable terminal \"bracketed paste mode\" (not supported in all terminals/"
 "multiplexers): in this mode, pasted text is bracketed with control sequences "
-"so that WeeChat can differentiate pasted text from typed-in text (\"ESC[200~"
-"\", followed by the pasted text, followed by \"ESC[201~\")"
+"so that WeeChat can differentiate pasted text from typed-in text "
+"(\"ESC[200~\", followed by the pasted text, followed by \"ESC[201~\")"
 msgstr ""
 "uçbirim \"ayraçlı yapıştırma kipi\"ni etkinleştir (tüm uçbirimlerde/"
 "çoğaltıcılarda desteklenmez): bu kipte yapıştırılan metin denetim dizileri "
@@ -5570,15 +5633,15 @@ msgid "bar position (bottom, top, left, right)"
 msgstr "çubuk konumu (alt, üst, sol, sağ)"
 
 msgid ""
-"bar filling direction (\"horizontal\" (from left to right) or \"vertical"
-"\" (from top to bottom)) when bar position is top or bottom"
+"bar filling direction (\"horizontal\" (from left to right) or "
+"\"vertical\" (from top to bottom)) when bar position is top or bottom"
 msgstr ""
 "çubuk doldurma yönü; çubuk konumu alt veya üst ise \"horizontal\" (soldan "
 "sağa) veya \"vertical\" (yukarıdan aşağıya)"
 
 msgid ""
-"bar filling direction (\"horizontal\" (from left to right) or \"vertical"
-"\" (from top to bottom)) when bar position is left or right"
+"bar filling direction (\"horizontal\" (from left to right) or "
+"\"vertical\" (from top to bottom)) when bar position is left or right"
 msgstr ""
 "çubuk doldurma yönü; çubuk konumu sol veya sağ ise \"horizontal\" (soldan "
 "sağa) veya \"vertical\" (yukarıdan aşağıya)"
@@ -5989,8 +6052,8 @@ msgstr ""
 "örneğin:\n"
 "    - ${window.number}\n"
 "    - ${window.buffer.full_name}\n"
-"  - arabellek verisi (tam bir liste için API belgelerinde hdata \"buffer"
-"\"):\n"
+"  - arabellek verisi (tam bir liste için API belgelerinde hdata "
+"\"buffer\"):\n"
 "    - ${buffer.number}\n"
 "    - ${buffer.name}\n"
 "    - ${buffer.full_name}\n"
@@ -6035,8 +6098,8 @@ msgstr ""
 "    - ${hotlist}: Ham sıcak liste\n"
 "    - ${hotlist_priority}: \"none\", \"low\", \"message\", \"private\" veya "
 "\"highlight\"\n"
-"    - ${hotlist_priority_number}: -1 = yok = düşük, 1 = ileti, 2 = "
-"özel, 3 = vurgula\n"
+"    - ${hotlist_priority_number}: -1 = yok = düşük, 1 = ileti, 2 = özel, 3 = "
+"vurgula\n"
 "    - ${format_lag}: IRC sunucu arabelleği için gecikme, yoksa boş (buflist."
 "format.lag seçeneğinin değerlendirmesi)\n"
 "    - ${format_tls_version}: Bir sunucu arabelleği için TLS sürümü "
@@ -6152,9 +6215,9 @@ msgstr ""
 "değişkendir; örneğin: \"${bar_item.name}\")"
 
 msgid ""
-"number of buflist bar items that can be used; the item names are: \"buflist"
-"\", \"buflist2\", \"buflist3\"; be careful, using more than one bar item "
-"slows down the display of buffers list"
+"number of buflist bar items that can be used; the item names are: "
+"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar "
+"item slows down the display of buffers list"
 msgstr ""
 "kullanılabilecek buflist çubuk ögelerinin sayısı; öge adları: \"buflist\", "
 "\"buflist2\", \"buflist3\"; dikkatli olun, birden çok çubuk ögesi kullanmak "
@@ -6600,8 +6663,8 @@ msgid ""
 "default options for command /exec (see /help exec); example: \"-nosh -bg\" "
 "to run all commands in background (no output), and without using the shell"
 msgstr ""
-"/exec komutu için öntanımlı seçenekler (bkz. /help exec); örnek: \"-nosh -bg"
-"\" komutu ile tüm komutlar arka planda kabuk olmadan çalıştırılabilir "
+"/exec komutu için öntanımlı seçenekler (bkz. /help exec); örnek: \"-nosh -"
+"bg\" komutu ile tüm komutlar arka planda kabuk olmadan çalıştırılabilir "
 "(çıktısız)"
 
 msgid ""
@@ -6750,24 +6813,24 @@ msgstr "(açıklama yok)"
 
 #, c-format
 msgid ""
-"%s%d%s/%s%d%s%s | Filter: %s%s%s | Sort: %s%s%s | Key(input): alt"
-"+space=toggle boolean, alt+'-'(-)=subtract 1 or set, alt+'+'(+)=add 1 or "
+"%s%d%s/%s%d%s%s | Filter: %s%s%s | Sort: %s%s%s | Key(input): "
+"alt+space=toggle boolean, alt+'-'(-)=subtract 1 or set, alt+'+'(+)=add 1 or "
 "append, alt+f,alt+r(r)=reset, alt+f,alt+u(u)=unset, alt+enter(s)=set, alt+f,"
-"alt+n(n)=set new value, alt+f,alt+a(a)=append, alt+','=mark/unmark, shift"
-"+down=mark and move down, shift+up=move up and mark, ($)=refresh, ($"
+"alt+n(n)=set new value, alt+f,alt+a(a)=append, alt+','=mark/unmark, "
+"shift+down=mark and move down, shift+up=move up and mark, ($)=refresh, ($"
 "$)=unmark/refresh, (m)=mark matching options, (u)=unmark matching options, "
 "alt+p(p)=toggle plugins desc, alt+v(v)=toggle help bar, ctrl+X(x)=switch "
 "format, (q)=close buffer"
 msgstr ""
-"%s%d%s/%s%d%s%s | Süzgeç: %s%s%s | Sırala: %s%s%s | Düğme (girdi): alt"
-"+space=boole aç kapa, alt+'-'(-)=1 çıkar veya ayarla, alt+'+'(+)=1 ekle veya "
-"iliştir, alt+f,alt+r(r)=sıfırla, alt+f,alt+u(u)=ayarı kaldır, alt"
-"+enter(s)=ayarla, alt+f,alt+n(n)=yeni değer ayarla, alt+f,alt+a(a)=iliştir, "
-"alt+','=imle/imi kaldır, shift+aşağı=imle ve aşağı git, shift+yukarı=yukarı "
-"git ve imle, ($)=yenile, ($$)=imi kaldır/yenile, (m)=eşleşen seçenekleri "
-"imle, (u)=eşleşen seçeneklerin imini kaldır, alt+p(p)=eklenti açıklamalarını "
-"aç/kapat, alt+v(v)=yardım çubuğunu aç/kapat, ctrl+X(x)=biçimi değiştir, "
-"(q)=arabelleği kapa"
+"%s%d%s/%s%d%s%s | Süzgeç: %s%s%s | Sırala: %s%s%s | Düğme (girdi): "
+"alt+space=boole aç kapa, alt+'-'(-)=1 çıkar veya ayarla, alt+'+'(+)=1 ekle "
+"veya iliştir, alt+f,alt+r(r)=sıfırla, alt+f,alt+u(u)=ayarı kaldır, "
+"alt+enter(s)=ayarla, alt+f,alt+n(n)=yeni değer ayarla, alt+f,"
+"alt+a(a)=iliştir, alt+','=imle/imi kaldır, shift+aşağı=imle ve aşağı git, "
+"shift+yukarı=yukarı git ve imle, ($)=yenile, ($$)=imi kaldır/yenile, "
+"(m)=eşleşen seçenekleri imle, (u)=eşleşen seçeneklerin imini kaldır, "
+"alt+p(p)=eklenti açıklamalarını aç/kapat, alt+v(v)=yardım çubuğunu aç/kapat, "
+"ctrl+X(x)=biçimi değiştir, (q)=arabelleği kapa"
 
 msgid "Fast set of WeeChat and plugins options"
 msgstr "WeeChat ve eklenti seçeneklerini hızlıca ayarla"
@@ -6973,8 +7036,8 @@ msgstr ""
 "      -down: Seçili satırı \"sayı\" kadar aşağı taşı\n"
 "      -left: fset arabelleğini solda \"yüzde\" kadar kaydır\n"
 "     -right: fset arabelleğini sağda \"yüzde\" kadar kaydır\n"
-"        -go: Sayıya göre satır seç, ilk satır numarası 0 (son satır \"end"
-"\")\n"
+"        -go: Sayıya göre satır seç, ilk satır numarası 0 (son satır "
+"\"end\")\n"
 "    -toggle: Boole değerini aç/kapat\n"
 "       -add: Tamsayılar ve renkler için \"değer\" ekle (negatif sayı "
 "olabilir), diğer türler için ayarla/iliştir (negatif için ayarla, pozitif "
@@ -7156,8 +7219,8 @@ msgstr ""
 "fset arabelleğinde kendiliğinden yenilecek seçeneklerin virgülle ayrılmış "
 "listesi (eğer açılmışsa); \"*\", tüm seçenekler (önerilen), \"!\" ile "
 "başlayan bir ad, bir seçeneğin yenilenmesini engelleyen bir negatif "
-"değerdir, \"*\" jokerine adlarda izin verilir (örnek: \"*,!plugin.section.*"
-"\")"
+"değerdir, \"*\" jokerine adlarda izin verilir (örnek: \"*,!plugin.section."
+"*\")"
 
 msgid ""
 "automatically unmark all options after an action on marked options or after "
@@ -7215,9 +7278,9 @@ msgid ""
 msgstr ""
 "seçenekleri sıralamak için kullanılan alanların virgülle ayrılmış listesi "
 "(alanların bir listesi için bkz. /help fset); sıralamayı tersine çevirmek "
-"için \"-\" karakteri, BÜYÜK/küçük harf duyarsız bir kıyaslama yapmak için \"~"
-"\" karakteri kullanılabilir; örnek: seçenek adında BÜYÜK/küçük harf duyarsız "
-"ve ters sıralama yapmak için \"-~ad\" kullanın"
+"için \"-\" karakteri, BÜYÜK/küçük harf duyarsız bir kıyaslama yapmak için "
+"\"~\" karakteri kullanılabilir; örnek: seçenek adında BÜYÜK/küçük harf "
+"duyarsız ve ters sıralama yapmak için \"-~ad\" kullanın"
 
 msgid "string displayed when an option is not marked"
 msgstr "bir seçenek imlenmediğinde görüntülenen dizi"
@@ -7579,9 +7642,11 @@ msgid_plural ""
 "%s%s: disconnected from %d servers (SSL connection not supported with "
 "upgrade)"
 msgstr[0] ""
-"%s%s: %d sunucu bağlantısı kesildi (SSL bağlantısı yükseltme ile desteklenmiyor)"
+"%s%s: %d sunucu bağlantısı kesildi (SSL bağlantısı yükseltme ile "
+"desteklenmiyor)"
 msgstr[1] ""
-"%s%s: %d sunucu bağlantısı kesildi (SSL bağlantısı yükseltme ile desteklenmiyor)"
+"%s%s: %d sunucu bağlantısı kesildi (SSL bağlantısı yükseltme ile "
+"desteklenmiyor)"
 
 #, c-format
 msgid ""
@@ -7694,8 +7759,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s%s: if you want to add a standard server, use the command \"/server add"
-"\" (see /help server); if you really want to add a temporary server (NOT "
+"%s%s: if you want to add a standard server, use the command \"/server "
+"add\" (see /help server); if you really want to add a temporary server (NOT "
 "SAVED), turn on the option irc.look.temporary_servers"
 msgstr ""
 "%s%s: Standart bir sunucu eklemek istiyorsanız \"/server add\" komutunu "
@@ -9202,9 +9267,9 @@ msgid ""
 "sent (message sent), modified (message modified by a modifier), redirected "
 "(message redirected)\n"
 "            m:xxx   show only IRC command \"xxx\"\n"
-"            c:xxx   show only messages matching the evaluated condition \"xxx"
-"\", using following variables: output of function irc_message_parse (like "
-"nick, command, channel, text, etc., see function info_get_hashtable in "
+"            c:xxx   show only messages matching the evaluated condition "
+"\"xxx\", using following variables: output of function irc_message_parse "
+"(like nick, command, channel, text, etc., see function info_get_hashtable in "
 "plugin API reference for the list of all variables), date (format: \"yyyy-mm-"
 "dd hh:mm:ss\"), server, recv, sent, modified, redirected\n"
 "\n"
@@ -9709,8 +9774,8 @@ msgid ""
 msgstr ""
 "gnutls için önceliği olan dizi (sözdizimi için gnutls kılavuzundaki "
 "gnutls_priority_init işlevinin belgelendirmesine bakın; en çok kullanılan "
-"diziler: \"PERFORMANCE\", \"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT"
-"\" ve \"NONE\")"
+"diziler: \"PERFORMANCE\", \"NORMAL\", \"SECURE128\", \"SECURE256\", "
+"\"EXPORT\" ve \"NONE\")"
 
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr "Diffie-Helman Anahtar Değişimi sırasında kullanılan anahtarın boyutu"
@@ -9791,10 +9856,10 @@ msgid ""
 "see /help eval; server options are evaluated with ${irc_server.xxx} and "
 "${server} is replaced by the server name)"
 msgstr ""
-"SASL kimlik doğrulaması için parola; bu seçenek, \"ecdsa-nist256p-challenge"
-"\" ve \"dış\" mekanizmalar için kullanılmaz (not: içerik değerlendirilir, "
-"bkz. /help eval; sunucu seçenekleri ${irc_server.xxx} ile değerlendirilir ve "
-"${server}, sunucu adı ile değiştirilir)"
+"SASL kimlik doğrulaması için parola; bu seçenek, \"ecdsa-nist256p-"
+"challenge\" ve \"dış\" mekanizmalar için kullanılmaz (not: içerik "
+"değerlendirilir, bkz. /help eval; sunucu seçenekleri ${irc_server.xxx} ile "
+"değerlendirilir ve ${server}, sunucu adı ile değiştirilir)"
 
 msgid ""
 "file with ECC private key for mechanism \"ecdsa-nist256p-challenge\" (path "
@@ -9874,8 +9939,8 @@ msgstr ""
 
 msgid ""
 "user mode(s) to set after connection to server and before executing command "
-"and the auto-join of channels; examples: \"+R\" (to set mode \"R\"), \"+R-i"
-"\" (to set mode \"R\" and remove \"i\"); see /help mode for the complete "
+"and the auto-join of channels; examples: \"+R\" (to set mode \"R\"), \"+R-"
+"i\" (to set mode \"R\" and remove \"i\"); see /help mode for the complete "
 "mode syntax (note: content is evaluated, see /help eval; server options are "
 "evaluated with ${irc_server.xxx} and ${server} is replaced by the server "
 "name)"
@@ -9936,8 +10001,8 @@ msgstr ""
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
-"variable on a channel to override this value (name of variable: \"autorejoin"
-"\", value: \"on\" or \"off\")"
+"variable on a channel to override this value (name of variable: "
+"\"autorejoin\", value: \"on\" or \"off\")"
 msgstr ""
 "kovulduktan sonra kanallara kendiliğinden yeniden katıl; bu değeri geçersiz "
 "kılmak için arabelleğe özel bir değişken tanımlayabilirsiniz (değişken adı: "
@@ -10187,8 +10252,8 @@ msgid ""
 "sensitive; special variables $nick, $channel and $server are replaced by "
 "their values), these words are added to buffer property \"highlight_words\" "
 "only when buffer is created (it does not affect current buffers), an empty "
-"string disables default highlight on nick, examples: \"$nick\", \"(?-i)$nick"
-"\""
+"string disables default highlight on nick, examples: \"$nick\", \"(?-"
+"i)$nick\""
 msgstr ""
 "kanal arabelleklerinde vurgulanacak sözcüklerin virgülle ayrılmış listesi "
 "(BÜYÜK/küçük harf duyarsız, duyarlı yapmak için sözcüklerin başında \"(?-"
@@ -10204,8 +10269,8 @@ msgid ""
 "sensitive; special variables $nick, $channel and $server are replaced by "
 "their values), these words are added to buffer property \"highlight_words\" "
 "only when buffer is created (it does not affect current buffers), an empty "
-"string disables default highlight on nick, examples: \"$nick\", \"(?-i)$nick"
-"\""
+"string disables default highlight on nick, examples: \"$nick\", \"(?-"
+"i)$nick\""
 msgstr ""
 "özel arabelleklerinde vurgulanacak sözcüklerin virgülle ayrılmış listesi "
 "(BÜYÜK/küçük harf duyarsız, duyarlı yapmak için sözcüklerin başında \"(?-"
@@ -10221,8 +10286,8 @@ msgid ""
 "sensitive; special variables $nick, $channel and $server are replaced by "
 "their values), these words are added to buffer property \"highlight_words\" "
 "only when buffer is created (it does not affect current buffers), an empty "
-"string disables default highlight on nick, examples: \"$nick\", \"(?-i)$nick"
-"\""
+"string disables default highlight on nick, examples: \"$nick\", \"(?-"
+"i)$nick\""
 msgstr ""
 "sunucu arabelleklerinde vurgulanacak sözcüklerin virgülle ayrılmış listesi "
 "(BÜYÜK/küçük harf duyarsız, duyarlı yapmak için sözcüklerin başında \"(?-"
@@ -10602,9 +10667,9 @@ msgstr ""
 msgid ""
 "default ban mask for commands /ban, /unban and /kickban; variables $nick, "
 "$user, $ident and $host are replaced by their values (extracted from \"nick!"
-"user@host\"); $ident is the same as $user if $user does not start with \"~"
-"\", otherwise it is set to \"*\"; this default mask is used only if WeeChat "
-"knows the host for the nick"
+"user@host\"); $ident is the same as $user if $user does not start with "
+"\"~\", otherwise it is set to \"*\"; this default mask is used only if "
+"WeeChat knows the host for the nick"
 msgstr ""
 "/ban, /unban ve /kickban komutları için öntanımlı yasaklama maskesi; $nick, "
 "$user, $ident ve $host değişkenleri kendi değerleriyle değiştirilir (\"nick!"
@@ -10746,11 +10811,11 @@ msgid "IRC host (like `:nick!name@server.com`)"
 msgstr "IRC makinesi (örneğin: `:nick!name@server.com`)"
 
 msgid ""
-"get nick color code (*deprecated* since version 1.5, replaced by \"nick_color"
-"\")"
+"get nick color code (*deprecated* since version 1.5, replaced by "
+"\"nick_color\")"
 msgstr ""
-"takma ad renk kodunu al (1.5 sürümünden itibaren kullanılmıyor, \"nick_color"
-"\" ile değiştirildi)"
+"takma ad renk kodunu al (1.5 sürümünden itibaren kullanılmıyor, "
+"\"nick_color\" ile değiştirildi)"
 
 msgid "nickname"
 msgstr "takma ad"
@@ -10798,23 +10863,23 @@ msgid ""
 "\"arguments\": arguments (includes channel), \"text\": text (for example "
 "user message), \"param1\" ... \"paramN\": parsed command parameters, "
 "\"num_params\": number of parsed command parameters, \"pos_command\": index "
-"of \"command\" message (\"-1\" if \"command\" was not found), \"pos_arguments"
-"\": index of \"arguments\" message (\"-1\" if \"arguments\" was not found), "
-"\"pos_channel\": index of \"channel\" message (\"-1\" if \"channel\" was not "
-"found), \"pos_text\": index of \"text\" message (\"-1\" if \"text\" was not "
-"found)"
+"of \"command\" message (\"-1\" if \"command\" was not found), "
+"\"pos_arguments\": index of \"arguments\" message (\"-1\" if \"arguments\" "
+"was not found), \"pos_channel\": index of \"channel\" message (\"-1\" if "
+"\"channel\" was not found), \"pos_text\": index of \"text\" message (\"-1\" "
+"if \"text\" was not found)"
 msgstr ""
-"\"tags\": etiketler, \"tag_xxx\": etiketin kaçırılmamış değeri \"xxx"
-"\" (etiket başına bir anahtar), \"message_without_tags\": etiketsiz ileti, "
-"\"nick\": takma ad, \"user\": kullanıcı adı, \"host\": makine, \"command\": "
-"komut, \"channel\": kanal, \"arguments\": argümanlar (kanalı içerir), \"text"
-"\": metin (örneğin: kullanıcı iletisi), \"param1\" ... \"paramN\": "
-"ayrıştırılmış komut parametreleri, \"num_params\": ayrıştırılmış komut "
-"parametrelerinin sayısı, \"pos_command\": \"command\" iletisinin indeksi "
-"(komut bulunamazsa \"-1\"), \"pos_arguments\": \"arguments\" iletisinin "
-"indeksi (\"arguments\" bulunamazsa \"-1\"), \"pos_channel\": \"channel\" "
-"iletisinin indeksi (\"channel\" bulunamazsa \"-1\"), \"pos_text\":  \"text\" "
-"iletisinin indeksi (\"text\" bulunamazsa \"-1\")"
+"\"tags\": etiketler, \"tag_xxx\": etiketin kaçırılmamış değeri "
+"\"xxx\" (etiket başına bir anahtar), \"message_without_tags\": etiketsiz "
+"ileti, \"nick\": takma ad, \"user\": kullanıcı adı, \"host\": makine, "
+"\"command\": komut, \"channel\": kanal, \"arguments\": argümanlar (kanalı "
+"içerir), \"text\": metin (örneğin: kullanıcı iletisi), \"param1\" ... "
+"\"paramN\": ayrıştırılmış komut parametreleri, \"num_params\": ayrıştırılmış "
+"komut parametrelerinin sayısı, \"pos_command\": \"command\" iletisinin "
+"indeksi (komut bulunamazsa \"-1\"), \"pos_arguments\": \"arguments\" "
+"iletisinin indeksi (\"arguments\" bulunamazsa \"-1\"), \"pos_channel\": "
+"\"channel\" iletisinin indeksi (\"channel\" bulunamazsa \"-1\"), "
+"\"pos_text\":  \"text\" iletisinin indeksi (\"text\" bulunamazsa \"-1\")"
 
 msgid "split an IRC message (to fit in 512 bytes by default)"
 msgstr "bir IRC iletisini böl (öntanımlı olarak 512 bayt'a sığması için)"
@@ -11950,12 +12015,12 @@ msgid ""
 "NOT use $server nor $channel); date specifiers are permitted (see man "
 "strftime)"
 msgstr ""
-"günlük dosyaları için öntanımlı dosya adı maskesi (biçim: \"dizinden/dosyaya"
-"\" veya ilk \"/\" olmadan \"dosya\"; çünkü dosyaya tam yolu yapmak için "
-"\"path\" seçeneği kullanılır); yerel arabellek değişkenleri kullanılabilir "
-"(yalnızca tüm arabellekler için tanımlanmış değişkenleri kullanmalısınız; "
-"örneğin hem ${server} hem ${channel} kullanmamalısınız); tarih "
-"belirticilerine izin verilir (bkz. /man strftime)"
+"günlük dosyaları için öntanımlı dosya adı maskesi (biçim: \"dizinden/"
+"dosyaya\" veya ilk \"/\" olmadan \"dosya\"; çünkü dosyaya tam yolu yapmak "
+"için \"path\" seçeneği kullanılır); yerel arabellek değişkenleri "
+"kullanılabilir (yalnızca tüm arabellekler için tanımlanmış değişkenleri "
+"kullanmalısınız; örneğin hem ${server} hem ${channel} kullanmamalısınız); "
+"tarih belirticilerine izin verilir (bkz. /man strftime)"
 
 msgid "use only lower case for log filenames"
 msgstr "günlük dosyaları için yalnızca küçük harfli dosya adları kullan"
@@ -12165,9 +12230,9 @@ msgid ""
 "\"weechat_config_dir\", \"weechat_data_dir\", \"weechat_cache_dir\" and "
 "\"weechat_runtime_dir\")"
 msgstr ""
-"WeeChat dizini (3.2 sürümünden itibaren *kullanılmıyor*, \"weechat_config_dir"
-"\", \"weechat_data_dir\", \"weechat_cache_dir\" ve \"weechat_runtime_dir\" "
-"ile değiştirildi)"
+"WeeChat dizini (3.2 sürümünden itibaren *kullanılmıyor*, "
+"\"weechat_config_dir\", \"weechat_data_dir\", \"weechat_cache_dir\" ve "
+"\"weechat_runtime_dir\" ile değiştirildi)"
 
 msgid "WeeChat config directory"
 msgstr "WeeChat yapılandırma dizini"
@@ -12642,9 +12707,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"keep context between two calls to the source code evaluation (option \"eval"
-"\" of script command or info \"%s_eval\"); a hidden script is used to eval "
-"script code; if this option is disabled, this hidden script is unloaded "
+"keep context between two calls to the source code evaluation (option "
+"\"eval\" of script command or info \"%s_eval\"); a hidden script is used to "
+"eval script code; if this option is disabled, this hidden script is unloaded "
 "after each eval: this uses less memory, but is slower"
 msgstr ""
 "kaynak kodu değerlendirmesine olan iki çağrı arasındaki bağlamı tut (betiğin "
@@ -13177,9 +13242,9 @@ msgstr ""
 msgid ""
 "comma separated list of hash algorithms used for password authentication in "
 "weechat protocol, among these values: \"plain\" (password in plain text, not "
-"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), \"*"
-"\" means all algorithms, a name beginning with \"!\" is a negative value to "
-"prevent an algorithm from being used, wildcard \"*\" is allowed in names "
+"hashed), \"sha256\", \"sha512\", \"pbkdf2+sha256\", \"pbkdf2+sha512\"), "
+"\"*\" means all algorithms, a name beginning with \"!\" is a negative value "
+"to prevent an algorithm from being used, wildcard \"*\" is allowed in names "
 "(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
 msgstr ""
 "weechat protokolünde parola doğrulaması yapmak için kullanılan sağlama "
@@ -13187,8 +13252,8 @@ msgstr ""
 "sağlaması yapılmamış), \"sha256\", \"sha512\", \"pbkdf2+sha256\", "
 "\"pbkdf2+sha512\"; \"*\" tüm algoritmalar anlamına gelir, \"!\" ile başlayan "
 "bir değer algoritmanın kullanılmasını engelleyen bir negatif değerdir, "
-"adlarda \"*\" jokerine izin verilir (örnekler: \"*\", \"pbkdf2\", \"*,!plain"
-"\")"
+"adlarda \"*\" jokerine izin verilir (örnekler: \"*\", \"pbkdf2\", \"*,!"
+"plain\")"
 
 msgid ""
 "number of iterations asked to the client in weechat protocol when a hashed "
@@ -13264,8 +13329,8 @@ msgstr "biriken günlüğü son iletinizden beri görüntüle"
 
 msgid ""
 "comma-separated list of messages tags which are displayed in backlog per IRC "
-"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick"
-"\", \"irc_privmsg\"), \"*\" = all supported tags"
+"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", "
+"\"irc_nick\", \"irc_privmsg\"), \"*\" = all supported tags"
 msgstr ""
 "IRC kanalı başına biriken günlükte görüntülenen ileti etiketlerinin virgülle "
 "ayrılmış listesi: (desteklenen etiketler: \"irc_join\", \"irc_part\", "
@@ -13448,8 +13513,8 @@ msgstr "%s%s: \"%s\" komutu çalıştırılamadı, %s%s%s istemcisi için"
 
 #, c-format
 msgid ""
-"%s%s: too few arguments received from client %s%s%s for command \"%s"
-"\" (received: %d arguments, expected: at least %d)"
+"%s%s: too few arguments received from client %s%s%s for command "
+"\"%s\" (received: %d arguments, expected: at least %d)"
 msgstr ""
 "%s%s: %s%s%s istemcisinden \"%s\" komutu için pek az argüman alındı (%d "
 "argüman alındı, en az %d bekleniyordu)"
@@ -14536,21 +14601,116 @@ msgstr "WeeChat'in İsviçre Çakısı olan tetikleri yönetin"
 
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
-"\" [\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
-"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
-"<new_name> || enable|disable|toggle [<name>|-all [<name>...]] || restart "
-"<name>|-all [<name>...] || show <name> || del <name>|-all [<name>...] || "
-"restore <name> [<name>...] || default -yes || monitor [<filter>]"
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
+"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
+"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
+"all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
+"<name>|-all [<name>...] || restore <name> [<name>...] || default -yes || "
+"monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <ad> <kanca> "
-"[\"<argümanlar>\" [\"<koşullar>\" [\"<ifade>\" [\"<komut>\" [\"<dönüş_kodu>"
-"\" [\"<eylem_sonra>\"]]]]]] || addinput [<kanca>] || input|output|recreate "
-"<ad> || set <ad> <seçenek> <değer> || rename|copy <ad> <yeni_ad> || enable|"
-"disable|toggle [<ad>|-all [<ad>...]] || restart <ad>|-all [<ad>...] || show "
-"<ad> || del <ad>|-all [<ad>...] || restore <ad> [<ad>...] || default -yes || "
-"monitor [<süzgeç>]"
+"[\"<argümanlar>\" [\"<koşullar>\" [\"<ifade>\" [\"<komut>\" [\"<dönüş_kodu>\" [\"<eylem_sonra>\"]]]]]] "
+"|| addinput [<kanca>] || input|output|recreate <ad> || set <ad> <seçenek> "
+"<değer> || rename|copy <ad> <yeni_ad> || enable|disable|toggle [<ad>|-all "
+"[<ad>...]] || restart <ad>|-all [<ad>...] || show <ad> || del <ad>|-all "
+"[<ad>...] || restore <ad> [<ad>...] || default -yes || monitor [<süzgeç>]"
 
+#, fuzzy
+#| msgid ""
+#| "       list: list triggers (without argument, this list is displayed)\n"
+#| "   listfull: list triggers with detailed info for each trigger\n"
+#| "listdefault: list default triggers\n"
+#| "        add: add a trigger\n"
+#| "     addoff: add a trigger (disabled)\n"
+#| " addreplace: add or replace an existing trigger\n"
+#| "       name: name of trigger\n"
+#| "       hook: signal, hsignal, modifier, line, print, command, "
+#| "command_run, timer, config, focus, info, info_hashtable\n"
+#| "  arguments: arguments for the hook, depending on hook (separated by "
+#| "semicolons):\n"
+#| "             signal: name(s) of signal (required)\n"
+#| "             hsignal: name(s) of hsignal (required)\n"
+#| "             modifier: name(s) of modifier (required)\n"
+#| "             line: buffer type (\"formatted\", \"free\" or \"*\"), list "
+#| "of buffer masks, tags\n"
+#| "             print: buffer, tags, message, strip colors\n"
+#| "             command: command (required), description, arguments, "
+#| "description of arguments, completion (all arguments except command are "
+#| "evaluated, \"${tg_trigger_name}\" is replaced by the trigger name, see /"
+#| "help eval)\n"
+#| "             command_run: command(s) (required)\n"
+#| "             timer: interval (required), align on second, max calls\n"
+#| "             config: name(s) of option (required)\n"
+#| "             focus: name(s) of area (required)\n"
+#| "             info: name(s) of info (required)\n"
+#| "             info_hashtable: name(s) of info (required)\n"
+#| " conditions: evaluated conditions for the trigger\n"
+#| "      regex: one or more regular expressions to replace strings in "
+#| "variables\n"
+#| "    command: command to execute (many commands can be separated by \";"
+#| "\")\n"
+#| "return_code: return code in callback (ok (default), ok_eat, error)\n"
+#| "post_action: action to take after execution (none (default), disable, "
+#| "delete)\n"
+#| "   addinput: set input with default arguments to create a trigger\n"
+#| "      input: set input with the command used to create the trigger\n"
+#| "     output: send the command to create the trigger on the buffer\n"
+#| "   recreate: same as \"input\", with option \"addreplace\" instead of "
+#| "\"add\"\n"
+#| "        set: set an option in a trigger\n"
+#| "     option: name of option: name, hook, arguments, conditions, regex, "
+#| "command, return_code\n"
+#| "             (for help on option, you can type: /help trigger.trigger."
+#| "<name>.<option>)\n"
+#| "      value: new value for the option\n"
+#| "     rename: rename a trigger\n"
+#| "       copy: copy a trigger\n"
+#| "     enable: enable trigger(s) (without arguments: enable triggers "
+#| "globally)\n"
+#| "    disable: disable trigger(s) (without arguments: disable triggers "
+#| "globally)\n"
+#| "     toggle: toggle trigger(s) (without arguments: toggle triggers "
+#| "globally)\n"
+#| "    restart: restart trigger(s) (recreate the hooks)\n"
+#| "       show: show detailed info on a trigger (with some stats)\n"
+#| "        del: delete a trigger\n"
+#| "       -all: do action on all triggers\n"
+#| "    restore: restore trigger(s) with the default values (works only for "
+#| "default triggers)\n"
+#| "    default: delete all triggers and restore default ones\n"
+#| "    monitor: open the trigger monitor buffer, with optional filter:\n"
+#| "     filter: filter hooks/triggers to display (a hook must start with "
+#| "\"@\", for example \"@signal\"), many filters can be separated by commas; "
+#| "wildcard \"*\" is allowed in each trigger name\n"
+#| "\n"
+#| "When a trigger callback is called, following actions are performed, in "
+#| "this order:\n"
+#| "  1. check conditions; if false, exit\n"
+#| "  2. replace text using POSIX extended regular expression(s) (if defined "
+#| "in trigger)\n"
+#| "  3. execute command(s) (if defined in trigger)\n"
+#| "  4. exit with a return code (except for modifier, line, focus, info and "
+#| "info_hashtable)\n"
+#| "  5. perform post action\n"
+#| "\n"
+#| "Examples (you can also look at default triggers with /trigger "
+#| "listdefault):\n"
+#| "  add text attributes *bold*, _underline_ and /italic/ (only in user "
+#| "messages):\n"
+#| "    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" "
+#| "\"==\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== "
+#| "==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/"
+#| "==/${color:italic}${re:1}${color:-italic}/\"\n"
+#| "  hide nicklist bar on small terminals:\n"
+#| "    /trigger add resize_small signal signal_sigwinch \"${info:term_width} "
+#| "< 100\" \"\" \"/bar hide nicklist\"\n"
+#| "    /trigger add resize_big signal signal_sigwinch \"${info:term_width} "
+#| ">= 100\" \"\" \"/bar show nicklist\"\n"
+#| "  silently save config each hour:\n"
+#| "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+#| "  open trigger monitor and show only modifiers and triggers whose name "
+#| "starts with \"resize\":\n"
+#| "    /trigger monitor @modifier,resize*"
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -14589,8 +14749,8 @@ msgid ""
 "   addinput: set input with default arguments to create a trigger\n"
 "      input: set input with the command used to create the trigger\n"
 "     output: send the command to create the trigger on the buffer\n"
-"   recreate: same as \"input\", with option \"addreplace\" instead of \"add"
-"\"\n"
+"   recreate: same as \"input\", with option \"addreplace\" instead of "
+"\"add\"\n"
 "        set: set an option in a trigger\n"
 "     option: name of option: name, hook, arguments, conditions, regex, "
 "command, return_code\n"
@@ -14630,10 +14790,10 @@ msgid ""
 "Examples (you can also look at default triggers with /trigger listdefault):\n"
 "  add text attributes *bold*, _underline_ and /italic/ (only in user "
 "messages):\n"
-"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"=="
-"\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_([^ ]+)_==_${color:"
-"underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/${color:"
-"italic}${re:1}${color:-italic}/\"\n"
+"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" "
+"\"==\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== "
+"==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/"
+"${color:italic}${re:1}${color:-italic}/\"\n"
 "  hide nicklist bar on small terminals:\n"
 "    /trigger add resize_small signal signal_sigwinch \"${info:term_width} < "
 "100\" \"\" \"/bar hide nicklist\"\n"
@@ -14641,6 +14801,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
@@ -14719,10 +14882,10 @@ msgstr ""
 "mevcuttur):\n"
 "  yalnızca kullanıcı iletilerine *kalın*, _altı çizili ve /eğik/ "
 "özniteliklerini ekle (yalnızcı kullanıcı iletilerinde):\n"
-"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"=="
-"\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_([^ ]+)_==_${color:"
-"underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/${color:"
-"italic}${re:1}${color:-italic}/\"\n"
+"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" "
+"\"==\\*([^ ]+)\\*==*${color:bold}${re:1}${color:-bold}*== "
+"==_([^ ]+)_==_${color:underline}${re:1}${color:-underline}_== ==/([^ ]+)/==/"
+"${color:italic}${re:1}${color:-italic}/\"\n"
 "  ufak uçbirimlerde takma ad listesi çubuğunu gizle:\n"
 "    /trigger add resize_small signal signal_sigwinch \"${info:term_width} < "
 "100\" \"\" \"/bar hide nicklist\"\n"
@@ -15127,8 +15290,8 @@ msgstr ""
 #, c-format
 msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
 msgstr ""
-"%3d. %s, %s ile sohbet (yerel takma ad: %s), %s tarihinde başladı, durum: %s"
-"%s"
+"%3d. %s, %s ile sohbet (yerel takma ad: %s), %s tarihinde başladı, durum: "
+"%s%s"
 
 #, c-format
 msgid ""
@@ -15381,3 +15544,8 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)"
+
+#, fuzzy
+#~| msgid "WeeChat version"
+#~ msgid "WeeChat session saved"
+#~ msgstr "WeeChat sürümü"
diff --git a/po/weechat.pot b/po/weechat.pot
index e2144218f..50cf8f46f 100644
--- 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: 2022-08-03 16:55+0200\n"
+"POT-Creation-Date: 2022-08-07 16:39+0200\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"
@@ -908,6 +908,13 @@ msgstr ""
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr ""
 
+#, c-format
+msgid "%sUnable to save WeeChat session (files *.upgrade)"
+msgstr ""
+
+msgid "WeeChat session saved (files *.upgrade)"
+msgstr ""
+
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -931,10 +938,6 @@ msgstr ""
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr ""
 
-#, c-format
-msgid "%sUnable to save session in file"
-msgstr ""
-
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -2157,10 +2160,12 @@ msgid ""
 "    /unset -mask weechat.color.*"
 msgstr ""
 
-msgid "reload the WeeChat binary without disconnecting from servers"
+msgid ""
+"save WeeChat session and reload the WeeChat binary without disconnecting "
+"from servers"
 msgstr ""
 
-msgid "[-yes] [<path_to_binary>|-quit]"
+msgid "[-yes] [<path_to_binary>|-save|-quit]"
 msgstr ""
 
 msgid ""
@@ -2169,6 +2174,9 @@ msgid ""
 "path_to_binary: path to WeeChat binary (default is current binary)\n"
 "        -dummy: do nothing (option used to prevent accidental completion "
 "with \"-quit\")\n"
+"         -save: only save the session, do not quit nor reload WeeChat; the "
+"configuration files are not saved (if needed you can use /save before this "
+"command)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -2176,9 +2184,14 @@ msgid ""
 "binary must have been compiled or installed with a package manager before "
 "running this command.\n"
 "\n"
-"Note: SSL connections are lost during upgrade, because reload of SSL "
-"sessions is currently not possible with GnuTLS. There is automatic "
-"reconnection after upgrade.\n"
+"Note: SSL connections are lost during upgrade (except with -save), because "
+"the reload of SSL sessions is currently not possible with GnuTLS. There is "
+"automatic reconnection after upgrade.\n"
+"\n"
+"Important: use of option -save can be dangerous, it is recommended to use "
+"only /upgrade (or with -quit) for a standard upgrade and a restart; the "
+"option -save can be used to save the session regularly and restore it in "
+"case of after abnormal exit (power outage, crash, etc.)\n"
 "\n"
 "Upgrade process has 4 steps:\n"
 "  1. save session into files for core and plugins (buffers, history, ..)\n"
@@ -2186,15 +2199,22 @@ msgid ""
 "  3. save WeeChat configuration (weechat.conf)\n"
 "  4. execute new WeeChat binary and reload session.\n"
 "\n"
-"With option \"-quit\", the process is slightly different:\n"
+"With option \"-quit\", the process is:\n"
 "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
 "  2. save session into files (*.upgrade)\n"
 "  3. unload all plugins\n"
 "  4. save WeeChat configuration\n"
 "  5. quit WeeChat\n"
-"Then later you can restore session with command: weechat --upgrade\n"
+"\n"
+"With option \"-save\", the process is:\n"
+"  1. save session into files (*.upgrade) with a disconnected state for IRC "
+"servers and Relay clients (but no disconnection is made)\n"
+"\n"
+"With -quit or -save, you can restore the session later with this command: "
+"weechat --upgrade\n"
 "IMPORTANT: you must restore the session with exactly same configuration "
-"(files *.conf).\n"
+"(files *.conf) and if possible the same WeeChat version (or a more recent "
+"one).\n"
 "It is possible to restore WeeChat session on another machine if you copy the "
 "content of WeeChat home directories (see /debug dirs)."
 msgstr ""
@@ -11131,6 +11151,9 @@ msgid ""
 "100\" \"\" \"/bar show nicklist\"\n"
 "  silently save config each hour:\n"
 "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+"  silently save WeeChat session at midnight (see /help upgrade):\n"
+"    /trigger add session_save signal day_changed \"\" \"\" \"/mute /upgrade -"
+"save\"\n"
 "  open trigger monitor and show only modifiers and triggers whose name "
 "starts with \"resize\":\n"
 "    /trigger monitor @modifier,resize*"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 5006b67be..f92d39dd2 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -6537,6 +6537,24 @@ COMMAND_CALLBACK(upgrade)
         return WEECHAT_RC_OK;
     }
 
+    if ((argc > index_args)
+        && (string_strcasecmp (argv[index_args], "-save") == 0))
+    {
+        /* send "upgrade" signal to plugins */
+        (void) hook_signal_send ("upgrade", WEECHAT_HOOK_SIGNAL_STRING,
+                                 "save");
+        /* save WeeChat session */
+        if (!upgrade_weechat_save())
+        {
+            gui_chat_printf (NULL,
+                             _("%sUnable to save WeeChat session "
+                               "(files *.upgrade)"),
+                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
+        }
+        gui_chat_printf (NULL, _("WeeChat session saved (files *.upgrade)"));
+        return WEECHAT_RC_OK;
+    }
+
     /*
      * it is forbidden to upgrade while there are some background process
      * (hook type "process" or "connect")
@@ -6623,7 +6641,8 @@ COMMAND_CALLBACK(upgrade)
     if (!upgrade_weechat_save ())
     {
         gui_chat_printf (NULL,
-                         _("%sUnable to save session in file"),
+                         _("%sUnable to save WeeChat session "
+                           "(files *.upgrade)"),
                          gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
         if (ptr_binary)
             free (ptr_binary);
@@ -8614,13 +8633,17 @@ command_init ()
         &command_unset, NULL, NULL);
     hook_command (
         NULL, "upgrade",
-        N_("reload the WeeChat binary without disconnecting from servers"),
-        N_("[-yes] [<path_to_binary>|-quit]"),
+        N_("save WeeChat session and reload the WeeChat binary without "
+           "disconnecting from servers"),
+        N_("[-yes] [<path_to_binary>|-save|-quit]"),
         N_("          -yes: required if option \"weechat.look.confirm_upgrade\" "
            "is enabled\n"
            "path_to_binary: path to WeeChat binary (default is current binary)\n"
            "        -dummy: do nothing (option used to prevent accidental "
            "completion with \"-quit\")\n"
+           "         -save: only save the session, do not quit nor reload "
+           "WeeChat; the configuration files are not saved (if needed you can "
+           "use /save before this command)\n"
            "         -quit: close *ALL* connections, save session and quit "
            "WeeChat, which makes possible a delayed restoration (see below)\n"
            "\n"
@@ -8628,9 +8651,15 @@ command_init ()
            "new WeeChat binary must have been compiled or installed with a "
            "package manager before running this command.\n"
            "\n"
-           "Note: SSL connections are lost during upgrade, because reload of "
-           "SSL sessions is currently not possible with GnuTLS. There is "
-           "automatic reconnection after upgrade.\n"
+           "Note: SSL connections are lost during upgrade (except with -save), "
+           "because the reload of SSL sessions is currently not possible with "
+           "GnuTLS. There is automatic reconnection after upgrade.\n"
+           "\n"
+           "Important: use of option -save can be dangerous, it is recommended "
+           "to use only /upgrade (or with -quit) for a standard upgrade and "
+           "a restart; the option -save can be used to save the session "
+           "regularly and restore it in case of after abnormal exit "
+           "(power outage, crash, etc.)\n"
            "\n"
            "Upgrade process has 4 steps:\n"
            "  1. save session into files for core and plugins (buffers, "
@@ -8640,18 +8669,25 @@ command_init ()
            "  3. save WeeChat configuration (weechat.conf)\n"
            "  4. execute new WeeChat binary and reload session.\n"
            "\n"
-           "With option \"-quit\", the process is slightly different:\n"
+           "With option \"-quit\", the process is:\n"
            "  1. close *ALL* connections (irc, xfer, relay, ...)\n"
            "  2. save session into files (*.upgrade)\n"
            "  3. unload all plugins\n"
            "  4. save WeeChat configuration\n"
            "  5. quit WeeChat\n"
-           "Then later you can restore session with command: weechat --upgrade\n"
+           "\n"
+           "With option \"-save\", the process is:\n"
+           "  1. save session into files (*.upgrade) with a disconnected state "
+           "for IRC servers and Relay clients (but no disconnection is made)\n"
+           "\n"
+           "With -quit or -save, you can restore the session later with "
+           "this command: weechat --upgrade\n"
            "IMPORTANT: you must restore the session with exactly same "
-           "configuration (files *.conf).\n"
+           "configuration (files *.conf) and if possible the same WeeChat "
+           "version (or a more recent one).\n"
            "It is possible to restore WeeChat session on another machine if you "
            "copy the content of WeeChat home directories (see /debug dirs)."),
-        "%(filename)|-dummy|-quit",
+        "%(filename)|-dummy|-save|-quit",
         &command_upgrade, NULL, NULL);
     hook_command (
         NULL, "uptime",
diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c
index 6918e9cbd..11dcf255f 100644
--- a/src/plugins/irc/irc-info.c
+++ b/src/plugins/irc/irc-info.c
@@ -534,7 +534,7 @@ irc_info_infolist_irc_server_cb (const void *pointer, void *data,
     if (obj_pointer)
     {
         /* build list with only one server */
-        if (!irc_server_add_to_infolist (ptr_infolist, obj_pointer))
+        if (!irc_server_add_to_infolist (ptr_infolist, obj_pointer, 0))
         {
             weechat_infolist_free (ptr_infolist);
             return NULL;
@@ -550,7 +550,7 @@ irc_info_infolist_irc_server_cb (const void *pointer, void *data,
             if (!arguments || !arguments[0]
                 || weechat_string_match (ptr_server->name, arguments, 0))
             {
-                if (!irc_server_add_to_infolist (ptr_infolist, ptr_server))
+                if (!irc_server_add_to_infolist (ptr_infolist, ptr_server, 0))
                 {
                     weechat_infolist_free (ptr_infolist);
                     return NULL;
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 6c1b8f408..a0f8acfe3 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -3907,6 +3907,13 @@ irc_server_close_connection (struct t_irc_server *server)
 {
     int i;
 
+    /*
+     * IMPORTANT: if changes are made in this function or sub-functions called,
+     * please also update the function irc_server_add_to_infolist:
+     * when the flag force_disconnected_state is set to 1 we simulate
+     * a disconnected state for server in infolist (used on /upgrade -save)
+     */
+
     if (server->hook_timer_connection)
     {
         weechat_unhook (server->hook_timer_connection);
@@ -5402,6 +5409,13 @@ irc_server_disconnect (struct t_irc_server *server, int switch_address,
 {
     struct t_irc_channel *ptr_channel;
 
+    /*
+     * IMPORTANT: if changes are made in this function or sub-functions called,
+     * please also update the function irc_server_add_to_infolist:
+     * when the flag force_disconnected_state is set to 1 we simulate
+     * a disconnected state for server in infolist (used on /upgrade -save)
+     */
+
     if (server->is_connected)
     {
         /*
@@ -5477,7 +5491,9 @@ irc_server_disconnect (struct t_irc_server *server, int switch_address,
 
     if (reconnect
         && IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTORECONNECT))
+    {
         irc_server_reconnect_schedule (server);
+    }
     else
     {
         server->reconnect_delay = 0;
@@ -6173,6 +6189,10 @@ irc_server_hdata_server_cb (const void *pointer, void *data,
 /*
  * Adds a server in an infolist.
  *
+ * If force_disconnected_state == 1, the infolist contains the server
+ * in a disconnected state (but the server is unchanged, still connected if it
+ * was).
+ *
  * Returns:
  *   1: OK
  *   0: error
@@ -6180,9 +6200,13 @@ irc_server_hdata_server_cb (const void *pointer, void *data,
 
 int
 irc_server_add_to_infolist (struct t_infolist *infolist,
-                            struct t_irc_server *server)
+                            struct t_irc_server *server,
+                            int force_disconnected_state)
 {
     struct t_infolist_item *ptr_item;
+    int reconnect_delay, reconnect_start;
+    struct timeval lag_check_time;
+    time_t lag_next_check;
 
     if (!infolist || !server)
         return 0;
@@ -6327,40 +6351,138 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "fake_server", server->fake_server))
         return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "index_current_address", server->index_current_address))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "current_address", server->current_address))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "current_ip", server->current_ip))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "current_port", server->current_port))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "current_retry", server->current_retry))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "sock", server->sock))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "is_connected", server->is_connected))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "ssl_connected", server->ssl_connected))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "disconnected", server->disconnected))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "unterminated_message", server->unterminated_message))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "nick", server->nick))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "nick_modes", server->nick_modes))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "host", server->host))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_ls", server->checking_cap_ls))
-        return 0;
-    if (!weechat_hashtable_add_to_infolist (server->cap_ls, ptr_item, "cap_ls"))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_list", server->checking_cap_list))
-        return 0;
-    if (!weechat_hashtable_add_to_infolist (server->cap_list, ptr_item, "cap_list"))
-        return 0;
+    if (server->is_connected && force_disconnected_state)
+    {
+        if (!weechat_infolist_new_var_integer (ptr_item, "index_current_address", 0))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "current_address", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "current_ip", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "current_port", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "current_retry", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "sock", -1))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "is_connected", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "ssl_connected", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "disconnected", 1))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "unterminated_message", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "monitor", 0))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "monitor_time", 0))
+            return 0;
+        reconnect_delay = IRC_SERVER_OPTION_INTEGER(
+            server,
+            IRC_SERVER_OPTION_AUTORECONNECT_DELAY);
+        reconnect_start = time (NULL) - reconnect_delay - 1;
+        if (!weechat_infolist_new_var_integer (ptr_item, "reconnect_delay", reconnect_delay))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "reconnect_start", reconnect_start))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "nick", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "nick_modes", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "host", NULL))
+            return 0;
+        /*
+         * note: these hashtables are NOT in the infolist when saving a
+         * disconnected state:
+         *   - cap_ls
+         *   - cap_list
+         */
+        if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_ls", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_list", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "is_away", 0))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "away_message", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "away_time", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "lag", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "lag_displayed", -1))
+            return 0;
+        lag_check_time.tv_sec = 0;
+        lag_check_time.tv_usec = 0;
+        lag_next_check = time (NULL) +
+            weechat_config_integer (irc_config_network_lag_check);
+        if (!weechat_infolist_new_var_buffer (ptr_item, "lag_check_time", &lag_check_time, sizeof (lag_check_time)))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "lag_next_check", lag_next_check))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "lag_last_refresh", 0))
+            return 0;
+    }
+    else
+    {
+        if (!weechat_infolist_new_var_integer (ptr_item, "index_current_address", server->index_current_address))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "current_address", server->current_address))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "current_ip", server->current_ip))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "current_port", server->current_port))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "current_retry", server->current_retry))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "sock", server->sock))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "is_connected", server->is_connected))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "ssl_connected", server->ssl_connected))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "disconnected", server->disconnected))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "unterminated_message", server->unterminated_message))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "monitor", server->monitor))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "monitor_time", server->monitor_time))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "reconnect_delay", server->reconnect_delay))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "reconnect_start", server->reconnect_start))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "nick", server->nick))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "nick_modes", server->nick_modes))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "host", server->host))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_ls", server->checking_cap_ls))
+            return 0;
+        if (!weechat_hashtable_add_to_infolist (server->cap_ls, ptr_item, "cap_ls"))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "checking_cap_list", server->checking_cap_list))
+            return 0;
+        if (!weechat_hashtable_add_to_infolist (server->cap_list, ptr_item, "cap_list"))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "is_away", server->is_away))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "away_message", server->away_message))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "away_time", server->away_time))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "lag", server->lag))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "lag_displayed", server->lag_displayed))
+            return 0;
+        if (!weechat_infolist_new_var_buffer (ptr_item, "lag_check_time", &(server->lag_check_time), sizeof (server->lag_check_time)))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "lag_next_check", server->lag_next_check))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "lag_last_refresh", server->lag_last_refresh))
+            return 0;
+    }
     if (!weechat_infolist_new_var_string (ptr_item, "isupport", server->isupport))
         return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "prefix_modes", server->prefix_modes))
@@ -6385,40 +6507,16 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
         return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "chanmodes", server->chanmodes))
         return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "monitor", server->monitor))
-        return 0;
-    if (!weechat_infolist_new_var_time (ptr_item, "monitor_time", server->monitor_time))
-        return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "clienttagdeny", server->clienttagdeny))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "typing_allowed", server->typing_allowed))
         return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "reconnect_delay", server->reconnect_delay))
-        return 0;
-    if (!weechat_infolist_new_var_time (ptr_item, "reconnect_start", server->reconnect_start))
-        return 0;
     if (!weechat_infolist_new_var_time (ptr_item, "command_time", server->command_time))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "reconnect_join", server->reconnect_join))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "disable_autojoin", server->disable_autojoin))
         return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "is_away", server->is_away))
-        return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "away_message", server->away_message))
-        return 0;
-    if (!weechat_infolist_new_var_time (ptr_item, "away_time", server->away_time))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "lag", server->lag))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "lag_displayed", server->lag_displayed))
-        return 0;
-    if (!weechat_infolist_new_var_buffer (ptr_item, "lag_check_time", &(server->lag_check_time), sizeof (struct timeval)))
-        return 0;
-    if (!weechat_infolist_new_var_time (ptr_item, "lag_next_check", server->lag_next_check))
-        return 0;
-    if (!weechat_infolist_new_var_time (ptr_item, "lag_last_refresh", server->lag_last_refresh))
-        return 0;
     if (!weechat_infolist_new_var_time (ptr_item, "last_user_message", server->last_user_message))
         return 0;
     if (!weechat_infolist_new_var_time (ptr_item, "last_away_check", server->last_away_check))
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index 041364943..f6cc28dc0 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -424,7 +424,8 @@ extern struct t_hdata *irc_server_hdata_server_cb (const void *pointer,
                                                    void *data,
                                                    const char *hdata_name);
 extern int irc_server_add_to_infolist (struct t_infolist *infolist,
-                                       struct t_irc_server *server);
+                                       struct t_irc_server *server,
+                                       int force_disconnected_state);
 extern void irc_server_print_log ();
 
 #endif /* WEECHAT_PLUGIN_IRC_SERVER_H */
diff --git a/src/plugins/irc/irc-upgrade.c b/src/plugins/irc/irc-upgrade.c
index 1744f9fd1..f29356703 100644
--- a/src/plugins/irc/irc-upgrade.c
+++ b/src/plugins/irc/irc-upgrade.c
@@ -52,7 +52,8 @@ struct t_irc_modelist *irc_upgrade_current_modelist = NULL;
  */
 
 int
-irc_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
+irc_upgrade_save_all_data (struct t_upgrade_file *upgrade_file,
+                           int force_disconnected_state)
 {
     struct t_infolist *infolist;
     struct t_irc_server *ptr_server;
@@ -73,7 +74,8 @@ irc_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
         infolist = weechat_infolist_new ();
         if (!infolist)
             return 0;
-        if (!irc_server_add_to_infolist (infolist, ptr_server))
+        if (!irc_server_add_to_infolist (infolist, ptr_server,
+                                         force_disconnected_state))
         {
             weechat_infolist_free (infolist);
             return 0;
@@ -105,64 +107,67 @@ irc_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
             if (!rc)
                 return 0;
 
-            for (ptr_nick = ptr_channel->nicks; ptr_nick;
-                 ptr_nick = ptr_nick->next_nick)
+            if (!force_disconnected_state)
             {
-                /* save nick */
-                infolist = weechat_infolist_new ();
-                if (!infolist)
-                    return 0;
-                if (!irc_nick_add_to_infolist (infolist, ptr_nick))
+                for (ptr_nick = ptr_channel->nicks; ptr_nick;
+                     ptr_nick = ptr_nick->next_nick)
                 {
-                    weechat_infolist_free (infolist);
-                    return 0;
-                }
-                rc = weechat_upgrade_write_object (upgrade_file,
-                                                   IRC_UPGRADE_TYPE_NICK,
-                                                   infolist);
-                weechat_infolist_free (infolist);
-                if (!rc)
-                    return 0;
-            }
-
-            for (ptr_modelist = ptr_channel->modelists; ptr_modelist;
-                 ptr_modelist = ptr_modelist->next_modelist)
-            {
-                /* save modelist */
-                infolist = weechat_infolist_new ();
-                if (!infolist)
-                    return 0;
-                if (!irc_modelist_add_to_infolist (infolist, ptr_modelist))
-                {
-                    weechat_infolist_free (infolist);
-                    return 0;
-                }
-                rc = weechat_upgrade_write_object (upgrade_file,
-                                                   IRC_UPGRADE_TYPE_MODELIST,
-                                                   infolist);
-                weechat_infolist_free (infolist);
-                if (!rc)
-                    return 0;
-
-                for (ptr_item = ptr_modelist->items; ptr_item;
-                     ptr_item = ptr_item->next_item)
-                {
-                    /* save modelist item */
+                    /* save nick */
                     infolist = weechat_infolist_new ();
                     if (!infolist)
                         return 0;
-                    if (!irc_modelist_item_add_to_infolist (infolist, ptr_item))
+                    if (!irc_nick_add_to_infolist (infolist, ptr_nick))
                     {
                         weechat_infolist_free (infolist);
                         return 0;
                     }
                     rc = weechat_upgrade_write_object (upgrade_file,
-                                                       IRC_UPGRADE_TYPE_MODELIST_ITEM,
+                                                       IRC_UPGRADE_TYPE_NICK,
                                                        infolist);
                     weechat_infolist_free (infolist);
                     if (!rc)
                         return 0;
                 }
+
+                for (ptr_modelist = ptr_channel->modelists; ptr_modelist;
+                     ptr_modelist = ptr_modelist->next_modelist)
+                {
+                    /* save modelist */
+                    infolist = weechat_infolist_new ();
+                    if (!infolist)
+                        return 0;
+                    if (!irc_modelist_add_to_infolist (infolist, ptr_modelist))
+                    {
+                        weechat_infolist_free (infolist);
+                        return 0;
+                    }
+                    rc = weechat_upgrade_write_object (upgrade_file,
+                                                       IRC_UPGRADE_TYPE_MODELIST,
+                                                       infolist);
+                    weechat_infolist_free (infolist);
+                    if (!rc)
+                        return 0;
+
+                    for (ptr_item = ptr_modelist->items; ptr_item;
+                         ptr_item = ptr_item->next_item)
+                    {
+                        /* save modelist item */
+                        infolist = weechat_infolist_new ();
+                        if (!infolist)
+                            return 0;
+                        if (!irc_modelist_item_add_to_infolist (infolist, ptr_item))
+                        {
+                            weechat_infolist_free (infolist);
+                            return 0;
+                        }
+                        rc = weechat_upgrade_write_object (upgrade_file,
+                                                           IRC_UPGRADE_TYPE_MODELIST_ITEM,
+                                                           infolist);
+                        weechat_infolist_free (infolist);
+                        if (!rc)
+                            return 0;
+                    }
+                }
             }
         }
 
@@ -263,7 +268,7 @@ irc_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
  */
 
 int
-irc_upgrade_save ()
+irc_upgrade_save (int force_disconnected_state)
 {
     int rc;
     struct t_upgrade_file *upgrade_file;
@@ -273,7 +278,7 @@ irc_upgrade_save ()
     if (!upgrade_file)
         return 0;
 
-    rc = irc_upgrade_save_all_data (upgrade_file);
+    rc = irc_upgrade_save_all_data (upgrade_file, force_disconnected_state);
 
     weechat_upgrade_close (upgrade_file);
 
diff --git a/src/plugins/irc/irc-upgrade.h b/src/plugins/irc/irc-upgrade.h
index cdcdf9bc1..fe4fd2d98 100644
--- a/src/plugins/irc/irc-upgrade.h
+++ b/src/plugins/irc/irc-upgrade.h
@@ -37,7 +37,7 @@ enum t_irc_upgrade_type
     IRC_UPGRADE_TYPE_MODELIST_ITEM,
 };
 
-extern int irc_upgrade_save ();
+extern int irc_upgrade_save (int force_disconnected_state);
 extern int irc_upgrade_load ();
 
 #endif /* WEECHAT_PLUGIN_IRC_UPGRADE_H */
diff --git a/src/plugins/irc/irc.c b/src/plugins/irc/irc.c
index e0c892dae..3d3fb7fd8 100644
--- a/src/plugins/irc/irc.c
+++ b/src/plugins/irc/irc.c
@@ -112,9 +112,21 @@ irc_signal_upgrade_cb (const void *pointer, void *data,
     (void) signal;
     (void) type_data;
 
+    /* only save session and continue? */
+    if (signal_data && (strcmp (signal_data, "save") == 0))
+    {
+        /*
+         * save session with a disconnected state in servers and a scheduled
+         * reconnection
+         */
+        irc_upgrade_save (1);
+        return WEECHAT_RC_OK;
+    }
+
     irc_signal_upgrade_received = 1;
 
     quit = (signal_data && (strcmp (signal_data, "quit") == 0));
+
     ssl_disconnected = 0;
 
     for (ptr_server = irc_servers; ptr_server;
@@ -142,8 +154,10 @@ irc_signal_upgrade_cb (const void *pointer, void *data,
              * after restart
              */
             ptr_server->index_current_address = 0;
-            ptr_server->reconnect_delay = IRC_SERVER_OPTION_INTEGER(ptr_server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY);
-            ptr_server->reconnect_start = time (NULL) - ptr_server->reconnect_delay - 1;
+            ptr_server->reconnect_delay = IRC_SERVER_OPTION_INTEGER(
+                ptr_server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY);
+            ptr_server->reconnect_start = time (NULL) -
+                ptr_server->reconnect_delay - 1;
         }
     }
     if (ssl_disconnected > 0)
@@ -293,7 +307,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     if (irc_signal_upgrade_received)
     {
         irc_config_write (1);
-        irc_upgrade_save ();
+        irc_upgrade_save (0);
     }
     else
     {
diff --git a/src/plugins/perl/weechat-perl.c b/src/plugins/perl/weechat-perl.c
index 751571437..9967b01a5 100644
--- a/src/plugins/perl/weechat-perl.c
+++ b/src/plugins/perl/weechat-perl.c
@@ -1228,7 +1228,8 @@ weechat_perl_signal_quit_upgrade_cb (const void *pointer, void *data,
     (void) type_data;
     (void) signal_data;
 
-    perl_quit_or_upgrade = 1;
+    if (!signal_data || (strcmp (signal_data, "save") != 0))
+        perl_quit_or_upgrade = 1;
 
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/relay/irc/relay-irc.c b/src/plugins/relay/irc/relay-irc.c
index dbdc53702..1526b1eb3 100644
--- a/src/plugins/relay/irc/relay-irc.c
+++ b/src/plugins/relay/irc/relay-irc.c
@@ -1957,6 +1957,10 @@ relay_irc_free (struct t_relay_client *client)
 /*
  * Adds client IRC data in an infolist.
  *
+ * If force_disconnected_state == 1, the infolist contains the client
+ * in a disconnected state (but the client is unchanged, still connected if it
+ * was).
+ *
  * Returns:
  *   1: OK
  *   0: error
@@ -1964,11 +1968,22 @@ relay_irc_free (struct t_relay_client *client)
 
 int
 relay_irc_add_to_infolist (struct t_infolist_item *item,
-                           struct t_relay_client *client)
+                           struct t_relay_client *client,
+                           int force_disconnected_state)
 {
     if (!item || !client)
         return 0;
 
+    if (!RELAY_CLIENT_HAS_ENDED(client) && force_disconnected_state)
+    {
+        if (!weechat_infolist_new_var_integer (item, "connected", 0))
+            return 0;
+    }
+    else
+    {
+        if (!weechat_infolist_new_var_integer (item, "connected", RELAY_IRC_DATA(client, connected)))
+            return 0;
+    }
     if (!weechat_infolist_new_var_string (item, "address", RELAY_IRC_DATA(client, address)))
         return 0;
     if (!weechat_infolist_new_var_integer (item, "password_ok", RELAY_IRC_DATA(client, password_ok)))
@@ -1981,8 +1996,6 @@ relay_irc_add_to_infolist (struct t_infolist_item *item,
         return 0;
     if (!weechat_infolist_new_var_integer (item, "cap_end_received", RELAY_IRC_DATA(client, cap_end_received)))
         return 0;
-    if (!weechat_infolist_new_var_integer (item, "connected", RELAY_IRC_DATA(client, connected)))
-        return 0;
     if (!weechat_infolist_new_var_integer (item, "server_capabilities", RELAY_IRC_DATA(client, server_capabilities)))
         return 0;
     if (!weechat_infolist_new_var_pointer (item, "hook_signal_irc_in2", RELAY_IRC_DATA(client, hook_signal_irc_in2)))
diff --git a/src/plugins/relay/irc/relay-irc.h b/src/plugins/relay/irc/relay-irc.h
index f525661ec..14359f746 100644
--- a/src/plugins/relay/irc/relay-irc.h
+++ b/src/plugins/relay/irc/relay-irc.h
@@ -73,7 +73,8 @@ extern void relay_irc_alloc_with_infolist (struct t_relay_client *client,
 extern enum t_relay_status relay_irc_get_initial_status (struct t_relay_client *client);
 extern void relay_irc_free (struct t_relay_client *client);
 extern int relay_irc_add_to_infolist (struct t_infolist_item *item,
-                                      struct t_relay_client *client);
+                                      struct t_relay_client *client,
+                                      int force_disconnected_state);
 extern void relay_irc_print_log (struct t_relay_client *client);
 
 #endif /* WEECHAT_PLUGIN_RELAY_IRC_H */
diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c
index 711c26d27..970a2764f 100644
--- a/src/plugins/relay/relay-client.c
+++ b/src/plugins/relay/relay-client.c
@@ -1610,6 +1610,13 @@ relay_client_set_status (struct t_relay_client *client,
 {
     struct t_relay_server *ptr_server;
 
+    /*
+     * IMPORTANT: if changes are made in this function or sub-functions called,
+     * please also update the function relay_client_add_to_infolist:
+     * when the flag force_disconnected_state is set to 1 we simulate
+     * a disconnected state for client in infolist (used on /upgrade -save)
+     */
+
     client->status = status;
 
     if (client->status == RELAY_STATUS_CONNECTED)
@@ -1821,6 +1828,10 @@ relay_client_disconnect_all ()
 /*
  * Adds a client in an infolist.
  *
+ * If force_disconnected_state == 1, the infolist contains the client
+ * in a disconnected state (but the client is unchanged, still connected if it
+ * was).
+ *
  * Returns:
  *   1: OK
  *   0: error
@@ -1828,7 +1839,8 @@ relay_client_disconnect_all ()
 
 int
 relay_client_add_to_infolist (struct t_infolist *infolist,
-                              struct t_relay_client *client)
+                              struct t_relay_client *client,
+                              int force_disconnected_state)
 {
     struct t_infolist_item *ptr_item;
     char value[128];
@@ -1844,24 +1856,46 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
         return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "desc", client->desc))
         return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "sock", client->sock))
-        return 0;
+    if (!RELAY_CLIENT_HAS_ENDED(client) && force_disconnected_state)
+    {
+        if (!weechat_infolist_new_var_integer (ptr_item, "sock", -1))
+            return 0;
+        if (!weechat_infolist_new_var_pointer (ptr_item, "hook_timer_handshake", NULL))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "gnutls_handshake_ok", 0))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "status", RELAY_STATUS_DISCONNECTED))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "end_time", time (NULL)))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "partial_message", NULL))
+            return 0;
+    }
+    else
+    {
+        if (!weechat_infolist_new_var_integer (ptr_item, "sock", client->sock))
+            return 0;
+        if (!weechat_infolist_new_var_pointer (ptr_item, "hook_timer_handshake", client->hook_timer_handshake))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "gnutls_handshake_ok", client->gnutls_handshake_ok))
+            return 0;
+        if (!weechat_infolist_new_var_integer (ptr_item, "status", client->status))
+            return 0;
+        if (!weechat_infolist_new_var_time (ptr_item, "end_time", client->end_time))
+            return 0;
+        if (!weechat_infolist_new_var_string (ptr_item, "partial_message", client->partial_message))
+            return 0;
+    }
     if (!weechat_infolist_new_var_integer (ptr_item, "server_port", client->server_port))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "ssl", client->ssl))
         return 0;
-    if (!weechat_infolist_new_var_pointer (ptr_item, "hook_timer_handshake", client->hook_timer_handshake))
-        return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "gnutls_handshake_ok", client->gnutls_handshake_ok))
-        return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "websocket", client->websocket))
         return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "address", client->address))
         return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "real_ip", client->real_ip))
         return 0;
-    if (!weechat_infolist_new_var_integer (ptr_item, "status", client->status))
-        return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "status_string", relay_client_status_string[client->status]))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "protocol", client->protocol))
@@ -1882,8 +1916,6 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
         return 0;
     if (!weechat_infolist_new_var_time (ptr_item, "start_time", client->start_time))
         return 0;
-    if (!weechat_infolist_new_var_time (ptr_item, "end_time", client->end_time))
-        return 0;
     if (!weechat_infolist_new_var_pointer (ptr_item, "hook_fd", client->hook_fd))
         return 0;
     if (!weechat_infolist_new_var_pointer (ptr_item, "hook_timer_send", client->hook_timer_send))
@@ -1900,16 +1932,16 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "send_data_type", client->send_data_type))
         return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "partial_message", client->partial_message))
-        return 0;
 
     switch (client->protocol)
     {
         case RELAY_PROTOCOL_WEECHAT:
-            relay_weechat_add_to_infolist (ptr_item, client);
+            relay_weechat_add_to_infolist (ptr_item, client,
+                                           force_disconnected_state);
             break;
         case RELAY_PROTOCOL_IRC:
-            relay_irc_add_to_infolist (ptr_item, client);
+            relay_irc_add_to_infolist (ptr_item, client,
+                                       force_disconnected_state);
             break;
         case RELAY_NUM_PROTOCOLS:
             break;
diff --git a/src/plugins/relay/relay-client.h b/src/plugins/relay/relay-client.h
index cd94b8b3f..955e8d529 100644
--- a/src/plugins/relay/relay-client.h
+++ b/src/plugins/relay/relay-client.h
@@ -165,7 +165,8 @@ extern void relay_client_free_all ();
 extern void relay_client_disconnect (struct t_relay_client *client);
 extern void relay_client_disconnect_all ();
 extern int relay_client_add_to_infolist (struct t_infolist *infolist,
-                                         struct t_relay_client *client);
+                                         struct t_relay_client *client,
+                                         int force_disconnected_state);
 extern void relay_client_print_log ();
 
 #endif /* WEECHAT_PLUGIN_RELAY_CLIENT_H */
diff --git a/src/plugins/relay/relay-info.c b/src/plugins/relay/relay-info.c
index 74acfd9fa..157a07155 100644
--- a/src/plugins/relay/relay-info.c
+++ b/src/plugins/relay/relay-info.c
@@ -140,7 +140,7 @@ relay_info_infolist_relay_cb (const void *pointer, void *data,
     if (obj_pointer)
     {
         /* build list with only one relay */
-        if (!relay_client_add_to_infolist (ptr_infolist, obj_pointer))
+        if (!relay_client_add_to_infolist (ptr_infolist, obj_pointer, 0))
         {
             weechat_infolist_free (ptr_infolist);
             return NULL;
@@ -153,7 +153,7 @@ relay_info_infolist_relay_cb (const void *pointer, void *data,
         for (ptr_client = relay_clients; ptr_client;
              ptr_client = ptr_client->next_client)
         {
-            if (!relay_client_add_to_infolist (ptr_infolist, ptr_client))
+            if (!relay_client_add_to_infolist (ptr_infolist, ptr_client, 0))
             {
                 weechat_infolist_free (ptr_infolist);
                 return NULL;
diff --git a/src/plugins/relay/relay-upgrade.c b/src/plugins/relay/relay-upgrade.c
index f3711590f..7a36e6348 100644
--- a/src/plugins/relay/relay-upgrade.c
+++ b/src/plugins/relay/relay-upgrade.c
@@ -41,7 +41,8 @@
  */
 
 int
-relay_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
+relay_upgrade_save_all_data (struct t_upgrade_file *upgrade_file,
+                             int force_disconnected_state)
 {
     struct t_infolist *infolist;
     struct t_relay_server *ptr_server;
@@ -76,7 +77,8 @@ relay_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
         infolist = weechat_infolist_new ();
         if (!infolist)
             return 0;
-        if (!relay_client_add_to_infolist (infolist, ptr_client))
+        if (!relay_client_add_to_infolist (infolist, ptr_client,
+                                           force_disconnected_state))
         {
             weechat_infolist_free (infolist);
             return 0;
@@ -121,7 +123,7 @@ relay_upgrade_save_all_data (struct t_upgrade_file *upgrade_file)
  */
 
 int
-relay_upgrade_save ()
+relay_upgrade_save (int force_disconnected_state)
 {
     int rc;
     struct t_upgrade_file *upgrade_file;
@@ -131,7 +133,7 @@ relay_upgrade_save ()
     if (!upgrade_file)
         return 0;
 
-    rc = relay_upgrade_save_all_data (upgrade_file);
+    rc = relay_upgrade_save_all_data (upgrade_file, force_disconnected_state);
 
     weechat_upgrade_close (upgrade_file);
 
diff --git a/src/plugins/relay/relay-upgrade.h b/src/plugins/relay/relay-upgrade.h
index c1822c086..853516160 100644
--- a/src/plugins/relay/relay-upgrade.h
+++ b/src/plugins/relay/relay-upgrade.h
@@ -31,7 +31,7 @@ enum t_relay_upgrade_type
     RELAY_UPGRADE_TYPE_SERVER,
 };
 
-extern int relay_upgrade_save ();
+extern int relay_upgrade_save (int force_disconnected_state);
 extern int relay_upgrade_load ();
 
 #endif /* WEECHAT_PLUGIN_RELAY_UPGRADE_H */
diff --git a/src/plugins/relay/relay.c b/src/plugins/relay/relay.c
index 49cdec221..5d5cd087c 100644
--- a/src/plugins/relay/relay.c
+++ b/src/plugins/relay/relay.c
@@ -96,6 +96,14 @@ relay_signal_upgrade_cb (const void *pointer, void *data,
     (void) type_data;
     (void) signal_data;
 
+    /* only save session and continue? */
+    if (signal_data && (strcmp (signal_data, "save") == 0))
+    {
+        /* save session with a disconnected state in clients */
+        relay_upgrade_save (1);
+        return WEECHAT_RC_OK;
+    }
+
     relay_signal_upgrade_received = 1;
 
     /* close socket for relay servers */
@@ -235,7 +243,9 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     relay_config_write ();
 
     if (relay_signal_upgrade_received)
-        relay_upgrade_save ();
+    {
+        relay_upgrade_save (0);
+    }
     else
     {
         relay_raw_message_free_all ();
diff --git a/src/plugins/relay/weechat/relay-weechat.c b/src/plugins/relay/weechat/relay-weechat.c
index 89e51c3b8..2ea0ee20a 100644
--- a/src/plugins/relay/weechat/relay-weechat.c
+++ b/src/plugins/relay/weechat/relay-weechat.c
@@ -141,6 +141,13 @@ relay_weechat_recv (struct t_relay_client *client, const char *data)
 void
 relay_weechat_close_connection (struct t_relay_client *client)
 {
+    /*
+     * IMPORTANT: if changes are made in this function or sub-functions called,
+     * please also update the function relay_weechat_add_to_infolist:
+     * when the flag force_disconnected_state is set to 1 we simulate
+     * a disconnected state for client in infolist (used on /upgrade -save)
+     */
+
     relay_weechat_unhook_signals (client);
 }
 
@@ -319,6 +326,10 @@ relay_weechat_free (struct t_relay_client *client)
 /*
  * Adds client WeeChat data in an infolist.
  *
+ * If force_disconnected_state == 1, the infolist contains the client
+ * in a disconnected state (but the client is unchanged, still connected if it
+ * was).
+ *
  * Returns:
  *   1: OK
  *   0: error
@@ -326,11 +337,15 @@ relay_weechat_free (struct t_relay_client *client)
 
 int
 relay_weechat_add_to_infolist (struct t_infolist_item *item,
-                               struct t_relay_client *client)
+                               struct t_relay_client *client,
+                               int force_disconnected_state)
 {
     if (!item || !client)
         return 0;
 
+    /* parameter not used today, it may be in future */
+    (void) force_disconnected_state;
+
     if (!weechat_infolist_new_var_integer (item, "handshake_done", RELAY_WEECHAT_DATA(client, handshake_done)))
         return 0;
     if (!weechat_infolist_new_var_integer (item, "password_ok", RELAY_WEECHAT_DATA(client, password_ok)))
diff --git a/src/plugins/relay/weechat/relay-weechat.h b/src/plugins/relay/weechat/relay-weechat.h
index 99f437199..d9037e985 100644
--- a/src/plugins/relay/weechat/relay-weechat.h
+++ b/src/plugins/relay/weechat/relay-weechat.h
@@ -76,7 +76,8 @@ extern void relay_weechat_alloc_with_infolist (struct t_relay_client *client,
 extern enum t_relay_status relay_weechat_get_initial_status (struct t_relay_client *client);
 extern void relay_weechat_free (struct t_relay_client *client);
 extern int relay_weechat_add_to_infolist (struct t_infolist_item *item,
-                                          struct t_relay_client *client);
+                                          struct t_relay_client *client,
+                                          int force_disconnected_state);
 extern void relay_weechat_print_log (struct t_relay_client *client);
 
 #endif /* WEECHAT_PLUGIN_RELAY_WEECHAT_H */
diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c
index 5c6fac3b4..6c64d75cb 100644
--- a/src/plugins/trigger/trigger-command.c
+++ b/src/plugins/trigger/trigger-command.c
@@ -1267,6 +1267,9 @@ trigger_command_init ()
            "\"${info:term_width} >= 100\" \"\" \"/bar show nicklist\"\n"
            "  silently save config each hour:\n"
            "    /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
+           "  silently save WeeChat session at midnight (see /help upgrade):\n"
+           "    /trigger add session_save signal day_changed \"\" \"\" "
+           "\"/mute /upgrade -save\"\n"
            "  open trigger monitor and show only modifiers and triggers whose "
            "name starts with \"resize\":\n"
            "    /trigger monitor @modifier,resize*"),
diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c
index 7d14ba998..c068f806f 100644
--- a/src/plugins/xfer/xfer.c
+++ b/src/plugins/xfer/xfer.c
@@ -128,6 +128,13 @@ xfer_signal_upgrade_cb (const void *pointer, void *data,
     (void) signal;
     (void) type_data;
 
+    /* only save session and continue? */
+    if (signal_data && (strcmp (signal_data, "save") == 0))
+    {
+        xfer_upgrade_save ();
+        return WEECHAT_RC_OK;
+    }
+
     xfer_signal_upgrade_received = 1;
 
     /*