From 85c88664072c905385e695196b30f3e26aa7dd32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sun, 9 Jun 2024 16:45:24 +0200
Subject: [PATCH] relay: add option `addreplace` in command `/remote` (issue
 #2095)

---
 CHANGELOG.md                      |  2 +-
 po/cs.po                          | 49 +++++++++++++++++++----------
 po/de.po                          | 52 ++++++++++++++++++++++---------
 po/es.po                          | 49 +++++++++++++++++++----------
 po/fr.po                          | 48 +++++++++++++++++-----------
 po/hu.po                          | 40 +++++++++++++++---------
 po/it.po                          | 49 +++++++++++++++++++----------
 po/ja.po                          | 51 +++++++++++++++++++-----------
 po/pl.po                          | 46 +++++++++++++++++++--------
 po/pt.po                          | 51 +++++++++++++++++++-----------
 po/pt_BR.po                       | 32 ++++++++++++-------
 po/ru.po                          | 40 +++++++++++++++---------
 po/sr.po                          | 48 +++++++++++++++++++---------
 po/tr.po                          | 51 +++++++++++++++++++-----------
 po/weechat.pot                    | 29 ++++++++++-------
 src/plugins/relay/relay-command.c | 50 +++++++++++++++++++++++------
 16 files changed, 461 insertions(+), 226 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 120a17cfa..0e50d3c7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - **breaking:** alias: display an error with `/alias add` or `/alias addcompletion` when the alias already exists, add options `addreplace` and `addreplacecompletion` in command `/alias` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - core: add option `addreplace` in commands `/bar` and `/proxy` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - irc: add option `addreplace` in commands `/ignore`, `/notify` and `/server` ([#2095](https://github.com/weechat/weechat/issues/2095))
-- relay: add option `addreplace` in command `/relay` ([#2095](https://github.com/weechat/weechat/issues/2095))
+- relay: add option `addreplace` in commands `/relay` and `/remote` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - relay: enable websocket extension "permessage-deflate" with "api" relay only ([#1549](https://github.com/weechat/weechat/issues/1549))
 
 ### Added
diff --git a/po/cs.po b/po/cs.po
index 71b02073d..afef4d413 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14138,8 +14138,20 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
+#| msgid ""
+#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
+#| "\"/disconnect %s\" before."
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste "
+"nejprve \"/dissconnect %s\"."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: chyba: přesměrování pro\"%s\" již existuje"
 
 #, fuzzy, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -14154,6 +14166,11 @@ msgstr "%s%s: nekorektní znaková sada: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: neplatný návratový kód \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Pole \"%s\" vytvořeno"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -14183,17 +14200,6 @@ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "Rozložení \"%s\" přejmenováno na  %s"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
-#| "\"/disconnect %s\" before."
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste "
-"nejprve \"/dissconnect %s\"."
-
 #, fuzzy, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "Limit pro zdroj \"%s\" byl nastaven na  %s"
@@ -14340,9 +14346,9 @@ msgstr "odpojit z jednoho nebo všech IRC serverů"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|"
@@ -14363,6 +14369,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "seznam položek polí"
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: chyba při přidávání notifikace"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -16938,6 +16949,10 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
 
+#, fuzzy, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
+
 #, fuzzy, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
diff --git a/po/de.po b/po/de.po
index 2a8ace414..1ee6920b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-05-31 20:32+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -15569,10 +15569,17 @@ msgid "No relay remote"
 msgstr "Kein Relay-Remote"
 
 #, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
 msgstr ""
-"%s%s: Remote-Relay \"%s\" existiert bereits und kann daher nicht angelegt "
-"werden!"
+"%s%s: Das Remote-Relay „%s“ kann nicht gelöscht werden, da eine Verbindung "
+"besteht. Die Verbindung sollte mit „/remote disconnect %s“ beendet werden."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: Fehler: Relay für \"%s\" existiert bereits"
 
 #, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -15586,6 +15593,11 @@ msgstr "%s%s: ungültige Remote-Relay-URL: „%s“"
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: ungültige Remote-Relay-Option: \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Remote relay \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Remote-Relay \"%s\" erstellt"
+
 #, c-format
 msgid "Remote relay \"%s\" created"
 msgstr "Remote-Relay \"%s\" erstellt"
@@ -15610,14 +15622,6 @@ msgstr "%s%s: Remote Relay \"%s\" existiert bereits für den Befehl „%s“"
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "%s: Remote Relay \"%s\" wurde umbenannt zu \"%s\""
 
-#, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: Das Remote-Relay „%s“ kann nicht gelöscht werden, da eine Verbindung "
-"besteht. Die Verbindung sollte mit „/remote disconnect %s“ beendet werden."
-
 #, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "%s: Remote Relay \"%s\" wurde gelöscht"
@@ -15772,10 +15776,15 @@ msgid "control of remote relay servers"
 msgstr "Steuerung von Remote-Relay-Servern"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || "
+#| "connect <name> || send <name> <json> || disconnect <name> || rename "
+#| "<name> <new_name> || del <name>"
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
 "<name> || send <name> <json> || disconnect <name> || rename <name> "
@@ -15794,6 +15803,13 @@ msgstr "raw[listfull]: listet alle relay-Server auf (ausführlich)"
 msgid "raw[add]: add a remote relay server"
 msgstr "raw[add]: erstellt einen neuen relay-Server"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing trigger"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr ""
+"raw[addreplace]: erzeugt neuen Trigger oder ersetzt einen schon "
+"existierenden Trigger"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -18647,6 +18663,12 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
 
+#, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr ""
+#~ "%s%s: Remote-Relay \"%s\" existiert bereits und kann daher nicht angelegt "
+#~ "werden!"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 8a30c39c1..2d1cb45d5 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14464,8 +14464,20 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: el servidor \"%s\" ya existe, ¡no se puede crear!"
+#| msgid ""
+#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
+#| "\"/disconnect %s\" before."
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: no puede eliminar el servidor \"%s\" al que ya está conectado. Pruebe "
+"\"/disconnect %s\" antes."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: error: repetidor para \"%s\" ya existe"
 
 #, fuzzy, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -14480,6 +14492,11 @@ msgstr "%s%s: set de caracteres inválido: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%sError: no se pudo deshacer el atajo \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Barra \"%s\" creada"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -14509,17 +14526,6 @@ msgstr "%s%s: ya existe el servidor \"%s\" para el comando \"%s\""
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "Tema \"%s\" renombrado a \"%s\""
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
-#| "\"/disconnect %s\" before."
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: no puede eliminar el servidor \"%s\" al que ya está conectado. Pruebe "
-"\"/disconnect %s\" antes."
-
 #, fuzzy, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "%s: servidor %s%s%s borrado"
@@ -14662,9 +14668,9 @@ msgstr "desconectarse de un o todos los servidores IRC"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<servidor>] || add <servidor> <hostname>[/<puerto>] [-temp] [-"
 "<opción>[=<valor>]] [-no<opción>] || copy|rename <servidor> <nuevo_nombre> "
@@ -14685,6 +14691,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "lista de elementos de barra"
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: error al agregar la notificación"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -17247,6 +17258,10 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse: error (%d)"
 
+#, fuzzy, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: el servidor \"%s\" ya existe, ¡no se puede crear!"
+
 #, fuzzy, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: el servidor \"%s\" ya existe, ¡no se puede crear!"
diff --git a/po/fr.po b/po/fr.po
index bddee3363..c8ee90173 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: 2024-06-09 16:21+0200\n"
-"PO-Revision-Date: 2024-06-09 16:22+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
+"PO-Revision-Date: 2024-06-09 16:36+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -15213,8 +15213,16 @@ msgid "No relay remote"
 msgstr "Pas de relai distant"
 
 #, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s : le relai distant \"%s\" existe déjà, impossible de l'ajouter !"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s : vous ne pouvez pas supprimer le relai distant \"%s\" car vous êtes "
+"connecté dessus. Essayez \"/remote disconnect %s\" avant."
+
+#, c-format
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s : le relai distant \"%s\" existe déjà"
 
 #, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -15228,6 +15236,10 @@ msgstr "%s%s : URL de relai distant invalide : \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s : option de relai distant invalide : \"%s\""
 
+#, c-format
+msgid "Remote relay \"%s\" updated"
+msgstr "Relai distant \"%s\" mis à jour"
+
 #, c-format
 msgid "Remote relay \"%s\" created"
 msgstr "Relai distant \"%s\" créé"
@@ -15252,14 +15264,6 @@ msgstr "%s%s : le relai distant \"%s\" existe déjà pour la commande \"%s\""
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "%s : relai distant \"%s\" renommé en \"%s\""
 
-#, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s : vous ne pouvez pas supprimer le relai distant \"%s\" car vous êtes "
-"connecté dessus. Essayez \"/remote disconnect %s\" avant."
-
 #, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "%s : le relai distant \"%s\" a été supprimé"
@@ -15404,13 +15408,13 @@ msgstr "contrôle des relais distants"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
-"list|listfull [<nom>] || add <nom> <url> [-<option>[=<valeur>]] || connect "
-"<nom> || send <nom> <json> || disconnect <nom> || rename <nom> <nouveau_nom> "
-"|| del <nom>"
+"list|listfull [<nom>] || add|addreplace <nom> <url> [-<option>[=<valeur>]] "
+"|| connect <nom> || send <nom> <json> || disconnect <nom> || rename <nom> "
+"<nouveau_nom> || del <nom>"
 
 msgid ""
 "raw[list]: list remote relay servers (without argument, this list is "
@@ -15425,6 +15429,9 @@ msgstr "raw[listfull] : afficher les relais distants (verbeux)"
 msgid "raw[add]: add a remote relay server"
 msgstr "raw[add] : ajouter un relai distant"
 
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "raw[addreplace] : ajouter ou remplacer un relai distant"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -18208,6 +18215,11 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
 
+#, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr ""
+#~ "%s%s : le relai distant \"%s\" existe déjà, impossible de l'ajouter !"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s : le serveur \"%s\" existe déjà, impossible de l'ajouter !"
diff --git a/po/hu.po b/po/hu.po
index fd1bfa0bc..84ce766e4 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13540,8 +13540,16 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s nem tudja törölni a \"%s\" szervert, mert csatlakozva van hozzá. Próbálja "
+"a /disconnect %s parancsot előbb.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s az ignore már létezik\n"
 
 #, fuzzy, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -13555,6 +13563,10 @@ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s nem sikerült a(z) \"%s\" billentyűparancsot visszavonni\n"
 
+#, fuzzy, c-format
+msgid "Remote relay \"%s\" updated"
+msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
+
 #, fuzzy, c-format
 msgid "Remote relay \"%s\" created"
 msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
@@ -13579,14 +13591,6 @@ msgstr "%s a \"%s\" szerver már létezik a(z) \"%s\" parancshoz\n"
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "a felhasználók le lettek tiltva"
 
-#, fuzzy, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s nem tudja törölni a \"%s\" szervert, mert csatlakozva van hozzá. Próbálja "
-"a /disconnect %s parancsot előbb.\n"
-
 #, fuzzy, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "A %s%s%s szerver törölve\n"
@@ -13714,9 +13718,9 @@ msgstr "kilépés a szerver(ek)ről"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks "
@@ -13737,6 +13741,10 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "Aliaszok listája:\n"
 
+#, fuzzy
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s nincs elég memória az információs pult üzenethez\n"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -16216,6 +16224,10 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
 
+#, fuzzy, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
+
 #, fuzzy, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
diff --git a/po/it.po b/po/it.po
index 3f89fdb32..7380f27a8 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14482,8 +14482,20 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!"
+#| msgid ""
+#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
+#| "\"/disconnect %s\" before."
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: impossibile eliminare il server \"%s\" quando la connessione è attiva. "
+"È necessario effettuare la disconnessione con \"/disconnect %s\"."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: errore: il relay per \"%s\" esiste già"
 
 #, fuzzy, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -14498,6 +14510,11 @@ msgstr "%s%s: set di caratter invalido: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%sErrore: impossibile rimuovere la combinazione del tasto \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Barra \"%s\" creata"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -14527,17 +14544,6 @@ msgstr "%s%s: il server \"%s\" esiste già per il comando \"%s\""
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "Il layout \"%s\" è stato rinominato in \"%s\""
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
-#| "\"/disconnect %s\" before."
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: impossibile eliminare il server \"%s\" quando la connessione è attiva. "
-"È necessario effettuare la disconnessione con \"/disconnect %s\"."
-
 #, fuzzy, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "%s: Il server %s%s%s è stato eliminato"
@@ -14686,9 +14692,9 @@ msgstr "disconnette da uno o tutti i server IRC"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<server>] || add <server> <host>[/<porta>] [-temp] [-"
 "<opzione>[=<valore>]] [-no<option>] || copy|rename <server> <nuovo_nome> || "
@@ -14709,6 +14715,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "elenco degli elementi barra"
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: errore nell'aggiunta della notifica"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -17310,6 +17321,10 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
 
+#, fuzzy, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!"
+
 #, fuzzy, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!"
diff --git a/po/ja.po b/po/ja.po
index 4bec12f53..4745d4a3e 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -14912,9 +14912,20 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s%s: server \"%s\" already exists, can't add it!"
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: サーバ \"%s\" は既に存在しており、追加できません"
+#| msgid ""
+#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
+#| "\"/disconnect %s\" before."
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: サーバ \"%s\" に接続しているためこれを削除できません。まず \"/"
+"disconnect %s\" をしてください。"
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: エラー: \"%s\" のリレーは既に存在しています"
 
 #, fuzzy, c-format
 #| msgid "%s%s: invalid trigger name: \"%s\""
@@ -14931,6 +14942,11 @@ msgstr "%s%s: 不正な文字セット: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: トリガ実行後処理の設定値が間違っています: \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "バー \"%s\" が作成されました"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -14961,17 +14977,6 @@ msgstr "%1$s%2$s: \"%4$s\" コマンドのサーバ \"%3$s\" は既に存在し
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "レイアウト \"%s\" を \"%s\" にリネームしました"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
-#| "\"/disconnect %s\" before."
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: サーバ \"%s\" に接続しているためこれを削除できません。まず \"/"
-"disconnect %s\" をしてください。"
-
 #, fuzzy, c-format
 #| msgid "%s: server %s%s%s has been deleted"
 msgid "%s: remote relay \"%s\" has been deleted"
@@ -15123,9 +15128,9 @@ msgstr "特定のまたは全ての IRC サーバとの接続を切断"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
@@ -15147,6 +15152,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "バー要素のリスト"
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: 通知の追加中にエラー"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -17823,6 +17833,11 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
 
+#, fuzzy, c-format
+#~| msgid "%s%s: server \"%s\" already exists, can't add it!"
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: サーバ \"%s\" は既に存在しており、追加できません"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: サーバ \"%s\" は既に存在しており、追加できません"
diff --git a/po/pl.po b/po/pl.po
index bb7576681..f57d6b846 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14819,8 +14819,17 @@ msgid "No relay remote"
 msgstr "Brak zdalnego pośrednika"
 
 #, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: zdalny pośrednik „%s” już istnieje, nie mogę go dodać!"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: nie możesz usunąć zdalnego pośrednika „%s”, ponieważ jesteś z nim "
+"połączony. Spróbuj najpierw wpisać \"/remote disconnect %s\"."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: błąd: relay dla \"%s\" już istnieje"
 
 #, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -14834,6 +14843,11 @@ msgstr "%s%s: nieprawidłowy URL zdalnego pośrednika: „%s”"
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: nieprawidłowa opcja zdalnego pośrednika „%s”"
 
+#, fuzzy, c-format
+#| msgid "Remote relay \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Utworzono pośrednika „%s”"
+
 #, c-format
 msgid "Remote relay \"%s\" created"
 msgstr "Utworzono pośrednika „%s”"
@@ -14858,14 +14872,6 @@ msgstr "%s%s: zdalny pośrednik „%s” już istnieje dla komendy „%s”"
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "%s: zmieniono nazwę pośrednika „%s” na „%s”"
 
-#, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: nie możesz usunąć zdalnego pośrednika „%s”, ponieważ jesteś z nim "
-"połączony. Spróbuj najpierw wpisać \"/remote disconnect %s\"."
-
 #, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "%s: zdalny pośrednik „%s” został usunięty"
@@ -15013,10 +15019,15 @@ msgid "control of remote relay servers"
 msgstr "kontrola nad serwerami pośredników"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || "
+#| "connect <name> || send <name> <json> || disconnect <name> || rename "
+#| "<name> <new_name> || del <name>"
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<nazwa>] || add <nazwa> <url> [-<opcja>[=<wartość>]] || "
 "connect <nazwa> || send <nazwa> <json> || disconnect <nazwa> || rename "
@@ -15035,6 +15046,11 @@ msgstr "raw[listfull]: wyświetl wszystkich pośredników (ze szczegółami)"
 msgid "raw[add]: add a remote relay server"
 msgstr "raw[add]: dodaj nowego pośrednika"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing trigger"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "raw[addreplace]: dodaj lub zastąp istniejący trigger"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -17739,6 +17755,10 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
 
+#, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: zdalny pośrednik „%s” już istnieje, nie mogę go dodać!"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: serwer \"%s\" już istnieje, nie mogę go dodać!"
diff --git a/po/pt.po b/po/pt.po
index 2dfcae892..a3d5edf0c 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -14829,9 +14829,20 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s%s: server \"%s\" already exists, can't add it!"
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: o servidor \"%s\" já existe, não é possível adicioná-lo!"
+#| msgid ""
+#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
+#| "\"/disconnect %s\" before."
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: não pode eliminar o servidor \"%s\" porque está conectado. Tente \"/"
+"disconnect %s\" primeiro."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: erro: já existe reencaminhamento de \"%s\""
 
 #, fuzzy, c-format
 #| msgid "%s%s: invalid trigger name: \"%s\""
@@ -14848,6 +14859,11 @@ msgstr "%s%s: charset inválido: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: ação posterior inválida \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Barra \"%s\" criada"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -14878,17 +14894,6 @@ msgstr "%s%s: o servidor \"%s\" do comando \"%s\" já existe"
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "O nome da disposição \"%s\" mudou para \"%s\""
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
-#| "\"/disconnect %s\" before."
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: não pode eliminar o servidor \"%s\" porque está conectado. Tente \"/"
-"disconnect %s\" primeiro."
-
 #, fuzzy, c-format
 #| msgid "%s: server %s%s%s has been deleted"
 msgid "%s: remote relay \"%s\" has been deleted"
@@ -15038,9 +15043,9 @@ msgstr "desconectar de um ou todos os servidores IRC"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<servidor>] || add <servidor> <hostname>[/<porta>] [-temp] [-"
 "<opção>[=<valor>]] [-no<opção>] || copy|rename <servidor> <novo_nome> || "
@@ -15061,6 +15066,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "lista de itens da barra"
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: error ao adicionar a notificação"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -17753,6 +17763,11 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
 
+#, fuzzy, c-format
+#~| msgid "%s%s: server \"%s\" already exists, can't add it!"
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: o servidor \"%s\" já existe, não é possível adicioná-lo!"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: o servidor \"%s\" já existe, não é possível adicioná-lo!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ce8bced09..13acb8e87 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13986,8 +13986,14 @@ msgstr "Atalhos de Cor:"
 msgid "No relay remote"
 msgstr ""
 
+#, c-format
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+msgid "%s%s: remote relay \"%s\" already exists"
 msgstr "%sErro: filtro \"%s\" já existe"
 
 #, fuzzy, c-format
@@ -14003,6 +14009,11 @@ msgstr "%s%s: charset inválido: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%sErro: não foi possível desassociar a tecla de atalho \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Barra \"%s\" criada"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -14030,12 +14041,6 @@ msgstr "%sErro: disposição \"%s\" já existe para comando \"%s\""
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "Disposição \"%s\" renomeado para \"%s\""
 
-#, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "Todos os filtros foram excluídos"
@@ -14178,9 +14183,9 @@ msgstr "desconectar de um ou todos os servidores IRC"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list || add <nome> <tipo> <endereço> <porta> [<nome de usuário> [<senha>]] "
 "|| del <nome>|-all || set <nome> <opção> <valor>"
@@ -14200,6 +14205,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "lista de itens da barra"
 
+#, fuzzy
+#| msgid "%s%s: failed to add word to personal dictionary"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: falha ao adicionar palavra no dicionário pessoal"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
diff --git a/po/ru.po b/po/ru.po
index 39d8c6b85..de4e7d4db 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13594,8 +13594,16 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s вы не можете удалить сервер \"%s\" потому, что подключены к нему. "
+"Попробуйте отключиться (/disconnect) %s перед удалением.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s игнорирование уже существует\n"
 
 #, fuzzy, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -13609,6 +13617,10 @@ msgstr "Не могу записать лог-файл \"%s\"\n"
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s не могу отвязать клавишу \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "Remote relay \"%s\" updated"
+msgstr "Сокращение \"%s\" => \"%s\" создано\n"
+
 #, fuzzy, c-format
 msgid "Remote relay \"%s\" created"
 msgstr "Сокращение \"%s\" => \"%s\" создано\n"
@@ -13633,14 +13645,6 @@ msgstr "%s сервер \"%s\" уже существует для команды
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "команда users отключена"
 
-#, fuzzy, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s вы не можете удалить сервер \"%s\" потому, что подключены к нему. "
-"Попробуйте отключиться (/disconnect) %s перед удалением.\n"
-
 #, fuzzy, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "Сервер %s%s%s удалён\n"
@@ -13768,9 +13772,9 @@ msgstr "отключиться от сервера(-ов)"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-"
 "temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] "
@@ -13791,6 +13795,10 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "Список сокращений:\n"
 
+#, fuzzy
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s недостаточно памяти для сообщения в строке информации\n"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -16266,6 +16274,10 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
 
+#, fuzzy, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n"
+
 #, fuzzy, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n"
diff --git a/po/sr.po b/po/sr.po
index 57076c44d..1a6402159 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-05-07 14:00+0400\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14825,8 +14825,17 @@ msgid "No relay remote"
 msgstr "Нема ниједног прослеђеног удаљеног"
 
 #, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: релеј удаљених „%s” већ постоји, не може да се дода!"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: не можете да обришете релеј удаљених „%s” јер сте повезани са њим. "
+"Покушајте прво да извршите „/remote disconnect %s”."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: грешка: релеј за „%s” већ постоји"
 
 #, c-format
 msgid "%s%s: invalid remote relay name: \"%s\""
@@ -14840,6 +14849,11 @@ msgstr "%s%s: неважећи URL релеја удаљених: „%s”"
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: неважећа опција релеја удаљених: „%s”"
 
+#, fuzzy, c-format
+#| msgid "Remote relay \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "Креиран је релеј удаљених „%s”"
+
 #, c-format
 msgid "Remote relay \"%s\" created"
 msgstr "Креиран је релеј удаљених „%s”"
@@ -14864,14 +14878,6 @@ msgstr "%s%s: релеј удаљених „%s” већ постоји за к
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "%s: име релеја удаљених „%s” је промењено на „%s”"
 
-#, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: не можете да обришете релеј удаљених „%s” јер сте повезани са њим. "
-"Покушајте прво да извршите „/remote disconnect %s”."
-
 #, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr "%s: релеј удаљених „%s” је обрисан"
@@ -15019,10 +15025,15 @@ msgid "control of remote relay servers"
 msgstr "контрола сервера релеја за удаљене"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || "
+#| "connect <name> || send <name> <json> || disconnect <name> || rename "
+#| "<name> <new_name> || del <name>"
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<име>] || add <име> <url> [-<опција>[=<вредност>]] || connect "
 "<име> || send <име> <json> || disconnect <име> || rename <име> <ново_име> || "
@@ -15041,6 +15052,11 @@ msgstr "raw[listfull]: приказује сервере релеја удаље
 msgid "raw[add]: add a remote relay server"
 msgstr "raw[add]: додавање сервера релеја удаљених"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing trigger"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "raw[addreplace]: додавање или замена постојећег окидача"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -17759,6 +17775,10 @@ msgstr "%s%s: тајмаут за „%s” са %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)"
 
+#, c-format
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: релеј удаљених „%s” већ постоји, не може да се дода!"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: сервер „%s” већ постоји, не може да се дода!"
diff --git a/po/tr.po b/po/tr.po
index 57dd75544..e8dcbcbd7 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -15084,9 +15084,20 @@ msgid "No relay remote"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "%s%s: server \"%s\" already exists, can't add it!"
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-msgstr "%s%s: \"%s\" sunucusu halihazırda mevcut, eklenemiyor!"
+#| msgid ""
+#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
+#| "\"/disconnect %s\" before."
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+"%s%s: \"%s\" sunucusunu silemezsiniz; çünkü ona bağlı değilsiniz. Önce \"/ "
+"disconnect %s\" deneyin."
+
+#, fuzzy, c-format
+#| msgid "%s%s: error: relay for \"%s\" already exists"
+msgid "%s%s: remote relay \"%s\" already exists"
+msgstr "%s%s: Hata: \"%s\" için iletim halihazırda mevcut"
 
 #, fuzzy, c-format
 #| msgid "%s%s: invalid trigger name: \"%s\""
@@ -15103,6 +15114,11 @@ msgstr "%s%s: Geçersiz karakter seti: \"%s\""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr "%s%s: Geçersiz gönderme eylemi \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Bar \"%s\" created"
+msgid "Remote relay \"%s\" updated"
+msgstr "\"%s\" çubuğu oluşturuldu"
+
 #, fuzzy, c-format
 #| msgid "Bar \"%s\" created"
 msgid "Remote relay \"%s\" created"
@@ -15133,17 +15149,6 @@ msgstr "%s%s: \"%s\" sunucusu \"%s\" komutu için halihazırda mevcut"
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr "\"%s\" diziliminin adı \"%s\" olarak değiştirildi"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s%s: you can not delete server \"%s\" because you are connected to. Try "
-#| "\"/disconnect %s\" before."
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-"%s%s: \"%s\" sunucusunu silemezsiniz; çünkü ona bağlı değilsiniz. Önce \"/ "
-"disconnect %s\" deneyin."
-
 #, fuzzy, c-format
 #| msgid "%s: server %s%s%s has been deleted"
 msgid "%s: remote relay \"%s\" has been deleted"
@@ -15305,9 +15310,9 @@ msgstr "bir veya diğer tüm IRC sunucuları bağlantısını kes"
 #| "reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
 #| "<name> || deloutq|jump || raw [<filter>]"
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 "list|listfull [<ad>] || add <ad> <makine>[/<kapı>] [-temp] [-"
 "<seçenek>[=<değer>]] [-no<seçenek>] || copy|rename <ad> <yeni_ad> || reorder "
@@ -15329,6 +15334,11 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr "özel çubuk ögelerini yönet"
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr "%s%s: Bildirim eklerken hata"
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
@@ -18077,6 +18087,11 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)"
 
+#, fuzzy, c-format
+#~| msgid "%s%s: server \"%s\" already exists, can't add it!"
+#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+#~ msgstr "%s%s: \"%s\" sunucusu halihazırda mevcut, eklenemiyor!"
+
 #, c-format
 #~ msgid "%s%s: server \"%s\" already exists, can't add it!"
 #~ msgstr "%s%s: \"%s\" sunucusu halihazırda mevcut, eklenemiyor!"
diff --git a/po/weechat.pot b/po/weechat.pot
index 9438ee149..1da6f408c 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: 2024-06-09 16:21+0200\n"
+"POT-Creation-Date: 2024-06-09 16:35+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"
@@ -12396,7 +12396,13 @@ msgid "No relay remote"
 msgstr ""
 
 #, c-format
-msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
+msgid ""
+"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
+"Try \"/remote disconnect %s\" before."
+msgstr ""
+
+#, c-format
+msgid "%s%s: remote relay \"%s\" already exists"
 msgstr ""
 
 #, c-format
@@ -12411,6 +12417,10 @@ msgstr ""
 msgid "%s%s: invalid remote relay option: \"%s\""
 msgstr ""
 
+#, c-format
+msgid "Remote relay \"%s\" updated"
+msgstr ""
+
 #, c-format
 msgid "Remote relay \"%s\" created"
 msgstr ""
@@ -12435,12 +12445,6 @@ msgstr ""
 msgid "%s: remote relay \"%s\" has been renamed to \"%s\""
 msgstr ""
 
-#, c-format
-msgid ""
-"%s%s: you can not delete remote relay \"%s\" because you are connected to. "
-"Try \"/remote disconnect %s\" before."
-msgstr ""
-
 #, c-format
 msgid "%s: remote relay \"%s\" has been deleted"
 msgstr ""
@@ -12561,9 +12565,9 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull [<name>] || add <name> <url> [-<option>[=<value>]] || connect "
-"<name> || send <name> <json> || disconnect <name> || rename <name> "
-"<new_name> || del <name>"
+"list|listfull [<name>] || add|addreplace <name> <url> [-<option>[=<value>]] "
+"|| connect <name> || send <name> <json> || disconnect <name> || rename "
+"<name> <new_name> || del <name>"
 msgstr ""
 
 msgid ""
@@ -12577,6 +12581,9 @@ msgstr ""
 msgid "raw[add]: add a remote relay server"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing remote relay server"
+msgstr ""
+
 msgid ""
 "name: name of remote relay server, for internal and display use; this name "
 "is used to connect to the remote relay and to set remote relay options: "
diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c
index be048ebb6..fb2c22bc9 100644
--- a/src/plugins/relay/relay-command.c
+++ b/src/plugins/relay/relay-command.c
@@ -460,7 +460,7 @@ relay_command_remote (const void *pointer, void *data,
                       char **argv, char **argv_eol)
 {
     struct t_relay_remote *ptr_remote, *ptr_remote2;
-    int i, detailed_list, one_remote_found;
+    int i, detailed_list, one_remote_found, update;
     const char *ptr_autoconnect, *ptr_proxy, *ptr_tls_verify, *ptr_password;
     const char *ptr_totp_secret;
     char *remote_name;
@@ -533,17 +533,41 @@ relay_command_remote (const void *pointer, void *data,
         return WEECHAT_RC_OK;
     }
 
-    if (weechat_strcmp (argv[1], "add") == 0)
+    if ((weechat_strcmp (argv[1], "add") == 0)
+        || (weechat_strcmp (argv[1], "addreplace") == 0))
     {
         WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
+        update = 0;
         ptr_remote = relay_remote_search (argv[2]);
         if (ptr_remote)
         {
-            weechat_printf (
-                NULL,
-                _("%s%s: remote relay \"%s\" already exists, can't add it!"),
-                weechat_prefix ("error"), RELAY_PLUGIN_NAME, ptr_remote->name);
-            return WEECHAT_RC_OK;
+            if (weechat_strcmp (argv[1], "addreplace") == 0)
+            {
+                if (!RELAY_STATUS_HAS_ENDED(ptr_remote->status))
+                {
+                    weechat_printf (
+                        NULL,
+                        _("%s%s: you can not delete remote relay \"%s\" because "
+                          "you are connected to. Try \"/remote disconnect %s\" "
+                          "before."),
+                        weechat_prefix ("error"),
+                        RELAY_PLUGIN_NAME,
+                        argv[2],
+                        argv[2]);
+                    return WEECHAT_RC_OK;
+                }
+                update = 1;
+                relay_remote_free (ptr_remote);
+            }
+            else
+            {
+                weechat_printf (
+                    NULL,
+                    _("%s%s: remote relay \"%s\" already exists"),
+                    weechat_prefix ("error"), RELAY_PLUGIN_NAME,
+                    ptr_remote->name);
+                return WEECHAT_RC_OK;
+            }
         }
         if (!relay_remote_name_valid (argv[2]))
         {
@@ -605,7 +629,12 @@ relay_command_remote (const void *pointer, void *data,
                                        ptr_totp_secret);
         if (ptr_remote)
         {
-            weechat_printf (NULL, _("Remote relay \"%s\" created"), argv[2]);
+            weechat_printf (
+                NULL,
+                (update) ?
+                _("Remote relay \"%s\" updated") :
+                _("Remote relay \"%s\" created"),
+                argv[2]);
         }
         else
         {
@@ -859,7 +888,7 @@ relay_command_init ()
         N_("control of remote relay servers"),
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated */
         N_("list|listfull [<name>]"
-           " || add <name> <url> [-<option>[=<value>]]"
+           " || add|addreplace <name> <url> [-<option>[=<value>]]"
            " || connect <name>"
            " || send <name> <json>"
            " || disconnect <name>"
@@ -870,6 +899,7 @@ relay_command_init ()
                "(without argument, this list is displayed)"),
             N_("raw[listfull]: list remote relay servers (verbose)"),
             N_("raw[add]: add a remote relay server"),
+            N_("raw[addreplace]: add or replace an existing remote relay server"),
             N_("name: name of remote relay server, for internal and display use; "
                "this name is used to connect to the remote relay and to set "
                "remote relay options: relay.remote.name.xxx"),
@@ -889,7 +919,7 @@ relay_command_init ()
             AI("  /remote del example")),
         "list %(relay_remotes)"
         " || listfull %(relay_remotes)"
-        " || add %(relay_remotes) https://localhost:9000 "
+        " || add|addreplace %(relay_remotes) https://localhost:9000 "
         "-autoconnect=on|-password=${xxx}|-proxy=xxx|-tls_verify=off|"
         "-totp_secret=${xxx}|%*"
         " || connect %(relay_remotes)"