Revert "core: add option "-save" in command /upgrade (closes #1630)"

This reverts commit 1df1903d230c4f8dbd0876b8bbc3454aa1af389c.

This is not so easy to implement: it requires saving state of plugins, and
plugins like irc can not save the connected state (except in a real upgrade
case where the sockets are still valid after exec of the new binary).

21 files changed, 170 insertions, 249 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 095b25192..d9e72f312 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -20,7 +20,6 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 New features::
 
-  * core: add option "-save" in command /upgrade (issue #1630)
   * core: add options to customize commands executed on system signals received (SIGHUP, SIGQUIT, SIGTERM, SIGUSR1, SIGUSR2) (issue #1595)
   * core: quit WeeChat by default when signal SIGHUP is received in normal run, reload configuration in weechat-headless (issue #1595)
   * api: add support of pointer names in function string_eval_expression (direct and in hdata)
diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc
index 4328a498c..db82c10cb 100644
--- a/doc/de/includes/autogen_user_commands.de.adoc
+++ b/doc/de/includes/autogen_user_commands.de.adoc
@@ -1953,36 +1953,35 @@ Beispiele:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: WeeChat Binärdatei neu laden, ohne die Verbindung zum Server zu trennen
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-save|-quit]
+/upgrade  [-yes] [<path_to_binary>|-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 not reload WeeChat)
-         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
+          -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)
 
-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.
+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.
 
-Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+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.
 
-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.
+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.
 
-With option "-quit", the process is slightly different:
-  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).
-It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat".
+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 Rechner wiederherzustellen, sofern man den Inhalt des "~/.weechat" Verzeichnisses dorthin kopiert.
 ----
 
 [[command_weechat_uptime]]
diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc
index b7220d5ea..8eefbdbdc 100644
--- a/doc/en/includes/autogen_user_commands.en.adoc
+++ b/doc/en/includes/autogen_user_commands.en.adoc
@@ -1953,15 +1953,14 @@ Examples:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-save|-quit]
+/upgrade  [-yes] [<path_to_binary>|-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 not reload WeeChat)
          -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.
diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc
index 04ef7f073..5ebc45cd4 100644
--- a/doc/fr/includes/autogen_user_commands.fr.adoc
+++ b/doc/fr/includes/autogen_user_commands.fr.adoc
@@ -1953,15 +1953,14 @@ Exemples :
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: sauvegarder la session WeeChat et relancer le binaire WeeChat sans se déconnecter des serveurs
+* `+upgrade+`: relancer le binaire WeeChat sans se déconnecter des serveurs
 
 ----
-/upgrade  [-yes] [<chemin_vers_binaire>|-save|-quit]
+/upgrade  [-yes] [<chemin_vers_binaire>|-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")
-              -save : sauvegarder seulement la session (ne pas quitter ni relancer WeeChat)
               -quit : fermer *TOUTES* les connexions, sauver 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.
diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc
index dcf6f553b..c75beaaec 100644
--- a/doc/it/includes/autogen_user_commands.it.adoc
+++ b/doc/it/includes/autogen_user_commands.it.adoc
@@ -1953,15 +1953,14 @@ Examples:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: reload the WeeChat binary without disconnecting from servers
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-save|-quit]
+/upgrade  [-yes] [<path_to_binary>|-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 not reload WeeChat)
          -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.
diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc
index 2b35bcd08..0ace26e69 100644
--- a/doc/ja/includes/autogen_user_commands.ja.adoc
+++ b/doc/ja/includes/autogen_user_commands.ja.adoc
@@ -1953,36 +1953,35 @@ option: オプションの名前
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: サーバとの接続を維持して WeeChat 実行バイナリを再読込
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-save|-quit]
+/upgrade  [-yes] [<path_to_binary>|-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 not reload WeeChat)
-         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
+          -yes: "weechat.look.confirm_upgrade" オプションが有効化されていた場合、このオプションは必須です。
+path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ)
+        -dummy: 何もしない (補完された "-quit" オプションを不用意に使わないためのオプション)
+         -quit: *すべての* 接続を閉じ、セッションを保存して 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.
+このコマンドは起動中の WeeChat セッションのアップグレードとリロードを行います。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、パッケージマネージャでインストールしなければいけません。
 
-Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では SSL セッションのリロードができないからです。アップグレードの後に自動的に再接続されます。
 
-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.
+アップグレードは 4 つの手順を踏みます:
+  1. コアとプラグイン (バッファ、履歴、...) のセッションをファイルに保存
+  2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込まれます)
+  3. WeeChat 設定を保存 (weechat.conf)
+  4. 新しい WeeChat バイナリを実行してセッションをリロード。
 
-With option "-quit", the process is slightly different:
-  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).
-It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat".
+オプション "-quit" を使うと、上の挙動が少し変わります:
+  1. *すべての* 接続を閉じる (irc、xfer、relay、...)
+  2. すべてのセッションをファイルに保存 (*.upgrade)
+  3. すべてのプラグインをアンロード
+  4. WeeChat 設定を保存
+  5. WeeChat を終了
+この後、セッションを回復させるには weechat --upgrade を使ってください。
+重要: 完全に同一の設定で (*.conf ファイルで) セッションを回復させてください。
+"~/.weechat" ディレクトリの内容をコピーすれば異なるマシンで WeeChat のセッションを回復することも可能です。
 ----
 
 [[command_weechat_uptime]]
diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc
index 2af3090c5..537c7c70e 100644
--- a/doc/pl/includes/autogen_user_commands.pl.adoc
+++ b/doc/pl/includes/autogen_user_commands.pl.adoc
@@ -1952,36 +1952,35 @@ Przykłady:
 ----
 
 [[command_weechat_upgrade]]
-* `+upgrade+`: save WeeChat session and reload the WeeChat binary without disconnecting from servers
+* `+upgrade+`: przeładowanie pliku binarnego WeeChat bez rozłączania z serwerami
 
 ----
-/upgrade  [-yes] [<path_to_binary>|-save|-quit]
+/upgrade  [-yes] [<ścieżka_do_binarki>|-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 not reload WeeChat)
-         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
+          -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)
 
-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.
+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.
 
-Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
+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.
 
-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.
+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.
 
-With option "-quit", the process is slightly different:
-  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).
-It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat".
+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ść katalogu "~/.weechat".
 ----
 
 [[command_weechat_uptime]]
diff --git a/po/cs.po b/po/cs.po
index 706b50931..ca959c0c8 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1030,10 +1030,6 @@ 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"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1060,6 +1056,10 @@ 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"
@@ -2568,13 +2568,10 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "aktualizovat WeeChat bez odpojení od serveru"
 
-#, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[-yes][<cesta_k_binárce>|-quit]"
 
 #, fuzzy
@@ -2584,7 +2581,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/de.po b/po/de.po
index 99a4a1933..8d2fbab4f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-03-29 09:21+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -1077,10 +1077,6 @@ 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 WeeChat session (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 "
@@ -1109,6 +1105,10 @@ 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 ""
 "***** Fehler: Ausführung schlug fehl (Programm: \"%s\"), WeeChat wird beendet"
@@ -3134,25 +3134,19 @@ msgstr ""
 "  Alle Farbeinstellungen zurücksetzen:\n"
 "    /unset -mask weechat.color.*"
 
-#, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr ""
 "WeeChat Binärdatei neu laden, ohne die Verbindung zum Server zu trennen"
 
-#, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-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"
-"         -save: only save the session (do not quit not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/es.po b/po/es.po
index 01fcdf7da..fc06a1769 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1022,10 +1022,6 @@ 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 WeeChat session (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 "
@@ -1053,6 +1049,10 @@ msgstr "Ninguna barra definida"
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr "Actualizando WeeChat con el archivo binario: \"%s\"..."
 
+#, fuzzy, 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"
@@ -2681,13 +2681,11 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "actualizar WeeChat sin desconectarse de los servidores"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[<ruta_al_ejecutable>|-quit]"
 
 #, fuzzy
@@ -2697,7 +2695,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/fr.po b/po/fr.po
index 1f3171dcb..8026b67e7 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: 2021-04-12 20:29+0200\n"
-"PO-Revision-Date: 2021-04-12 20:31+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
+"PO-Revision-Date: 2021-04-11 09:29+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1061,10 +1061,6 @@ 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)"
-
-#, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
 "'process' or 'connect')"
@@ -1092,6 +1088,10 @@ 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"
 
@@ -3058,15 +3058,11 @@ msgstr ""
 "  réinitialiser toutes les options de couleur :\n"
 "    /unset -mask weechat.color.*"
 
-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 "reload the WeeChat binary without disconnecting from servers"
+msgstr "relancer le binaire WeeChat sans se déconnecter des serveurs"
 
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
-msgstr "[-yes] [<chemin_vers_binaire>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
+msgstr "[-yes] [<chemin_vers_binaire>|-quit]"
 
 msgid ""
 "          -yes: required if option \"weechat.look.confirm_upgrade\" is "
@@ -3074,7 +3070,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
@@ -3110,8 +3105,6 @@ msgstr ""
 "courant)\n"
 "             -dummy : ne rien faire (option utilisée pour éviter une "
 "complétion accidentelle avec \"-quit\")\n"
-"              -save : sauvegarder seulement la session (ne pas quitter ni "
-"relancer WeeChat)\n"
 "              -quit : fermer *TOUTES* les connexions, sauver la session et "
 "quitter, ce qui rend possible une restauration différée (voir ci-dessous)\n"
 "\n"
diff --git a/po/hu.po b/po/hu.po
index 26676d587..3d9f42370 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1052,10 +1052,6 @@ 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"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1080,6 +1076,10 @@ 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"
 
@@ -2270,13 +2270,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "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>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[path_to_binary]"
 
 #, fuzzy
@@ -2286,7 +2284,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/it.po b/po/it.po
index 3676f0bfa..e1c63eb9e 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1008,10 +1008,6 @@ 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"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1039,6 +1035,10 @@ 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"
@@ -2769,13 +2769,11 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "aggiorna WeeChat senza disconnettere dai server"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[<path_del_binario>|-quit]"
 
 #, fuzzy
@@ -2785,7 +2783,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/ja.po b/po/ja.po
index 51ff01f24..22974fe04 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -1040,10 +1040,6 @@ 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エラー: ファイルにセッションを保存できません"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1070,6 +1066,10 @@ 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 を終了しています"
@@ -2935,24 +2935,18 @@ msgstr ""
 "  全ての色関連オプションをリセット:\n"
 "    /unset -mask weechat.color.*"
 
-#, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "サーバとの接続を維持して WeeChat 実行バイナリを再読込"
 
-#, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-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"
-"         -save: only save the session (do not quit not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/pl.po b/po/pl.po
index 88766645b..f9e204e1b 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-03-14 13:37+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -1059,10 +1059,6 @@ 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 WeeChat session (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 "
@@ -1091,6 +1087,10 @@ 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 ""
 "***** Błąd: wykonanie nie powiodło się (program: \"%s\"), wyjście z WeeChat"
@@ -3028,24 +3028,18 @@ msgstr ""
 "  resetowanie wszystkich opcji dotyczących kolorów:\n"
 "    /unset weechat.color.*"
 
-#, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "przeładowanie pliku binarnego WeeChat bez rozłączania z serwerami"
 
-#, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-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"
-"         -save: only save the session (do not quit not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/pt.po b/po/pt.po
index c9f5c171d..abdbebd24 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -1031,10 +1031,6 @@ 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"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1062,6 +1058,10 @@ 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 ""
@@ -2930,23 +2930,18 @@ msgstr ""
 "    /unset -mask weechat.color.*"
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "atualizar o WeeChat sem desconectar dos servidores"
 
-#, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[-yes] [<binário>|-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"
-"         -save: only save the session (do not quit not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a76806e37..5e26998b8 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-03-05 20:43+0100\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1043,10 +1043,6 @@ 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"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1074,6 +1070,10 @@ 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"
@@ -2713,13 +2713,11 @@ msgstr ""
 "    /unset weechat.color.*"
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "atualiza o WeeChat sem desconectar dos servidores"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[<caminho_para_o_binário>|-quit]"
 
 #, fuzzy
@@ -2729,7 +2727,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/ru.po b/po/ru.po
index cf1bc91d9..88cfe7b60 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1073,10 +1073,6 @@ 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"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -1101,6 +1097,10 @@ 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"
 
@@ -2293,13 +2293,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr "обновить WeeChat не отключаясь от серверов"
 
 #, fuzzy
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr "[путь_к_исполняемому_файлу]"
 
 #, fuzzy
@@ -2309,7 +2307,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/tr.po b/po/tr.po
index 54d6d7e87..0c18c29cf 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+0200\n"
 "PO-Revision-Date: 2021-02-06 15:55+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -958,10 +958,6 @@ msgstr ""
 msgid "%d option(s) reset, %d option(s) removed"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%sUnable to save WeeChat session (files *.upgrade)"
-msgstr "%sHata: dosya \"%s\" oluşturulamaz"
-
 #, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
@@ -985,6 +981,10 @@ msgstr ""
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%sUnable to save session in file"
+msgstr "%sHata: dosya \"%s\" oluşturulamaz"
+
 #, c-format
 msgid "***** Error: exec failed (program: \"%s\"), exiting WeeChat"
 msgstr ""
@@ -2083,12 +2083,10 @@ msgid ""
 "    /unset -mask weechat.color.*"
 msgstr ""
 
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr ""
 
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr ""
 
 msgid ""
@@ -2097,7 +2095,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 3929f53ed..6c8adb26c 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: 2021-04-12 20:29+0200\n"
+"POT-Creation-Date: 2021-04-11 09:28+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"
@@ -961,10 +961,6 @@ msgid "%d option(s) reset, %d option(s) removed"
 msgstr ""
 
 #, c-format
-msgid "%sUnable to save WeeChat session (files *.upgrade)"
-msgstr ""
-
-#, c-format
 msgid ""
 "%sCan't upgrade: there is one or more background process (hook type "
 "'process' or 'connect')"
@@ -988,6 +984,10 @@ 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 ""
 
@@ -2080,12 +2080,10 @@ msgid ""
 "    /unset -mask weechat.color.*"
 msgstr ""
 
-msgid ""
-"save WeeChat session and reload the WeeChat binary without disconnecting "
-"from servers"
+msgid "reload the WeeChat binary without disconnecting from servers"
 msgstr ""
 
-msgid "[-yes] [<path_to_binary>|-save|-quit]"
+msgid "[-yes] [<path_to_binary>|-quit]"
 msgstr ""
 
 msgid ""
@@ -2094,7 +2092,6 @@ 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 not reload WeeChat)\n"
 "         -quit: close *ALL* connections, save session and quit WeeChat, "
 "which makes possible a delayed restoration (see below)\n"
 "\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index fdd6e7f79..cd85e8173 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -6363,19 +6363,6 @@ COMMAND_CALLBACK(upgrade)
         return WEECHAT_RC_OK;
     }
 
-    if ((argc > index_args)
-        && (string_strcasecmp (argv[index_args], "-save") == 0))
-    {
-        if (!upgrade_weechat_save ())
-        {
-            gui_chat_printf (NULL,
-                             _("%sUnable to save WeeChat session "
-                               "(files *.upgrade)"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
-        }
-        return WEECHAT_RC_OK;
-    }
-
     /*
      * it is forbidden to upgrade while there are some background process
      * (hook type "process" or "connect")
@@ -6462,8 +6449,7 @@ COMMAND_CALLBACK(upgrade)
     if (!upgrade_weechat_save ())
     {
         gui_chat_printf (NULL,
-                         _("%sUnable to save WeeChat session "
-                           "(files *.upgrade)"),
+                         _("%sUnable to save session in file"),
                          gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
         if (ptr_binary)
             free (ptr_binary);
@@ -8309,16 +8295,13 @@ command_init ()
         &command_unset, NULL, NULL);
     hook_command (
         NULL, "upgrade",
-        N_("save WeeChat session and reload the WeeChat binary without "
-           "disconnecting from servers"),
-        N_("[-yes] [<path_to_binary>|-save|-quit]"),
+        N_("reload the WeeChat binary without disconnecting from servers"),
+        N_("[-yes] [<path_to_binary>|-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 not "
-           "reload WeeChat)\n"
            "         -quit: close *ALL* connections, save session and quit "
            "WeeChat, which makes possible a delayed restoration (see below)\n"
            "\n"
@@ -8349,7 +8332,7 @@ command_init ()
            "configuration (files *.conf).\n"
            "It is possible to restore WeeChat session on another machine if you "
            "copy the content of directory \"~/.weechat\"."),
-        "%(filename)|-dummy|-save|-quit",
+        "%(filename)|-dummy|-quit",
         &command_upgrade, NULL, NULL);
     hook_command (
         NULL, "uptime",