diff --git a/CHANGELOG.md b/CHANGELOG.md
index bca8d2cdf..97e04ed81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 ### Changed
 
 - **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 command `/bar` ([#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))
 - 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 0b0955def..1ed139cb2 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -788,10 +788,19 @@ msgstr "(žádné)"
 msgid "No proxy defined"
 msgstr "Proxy nejsou definovány"
 
+#, fuzzy, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%s%s: vzorec přesměrování \"%s\" již existuje"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sChyba: špatný typ \"%s\" pro proxy \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy byla smazána"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" přidána"
@@ -3083,8 +3092,9 @@ msgstr "spravovat proxy"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <jméno> <typ> <adresa> <port> [<uživatel> [<heslo>]] || del "
 "<jméno>|-all || set <jméno> <volba> <hodnota>"
@@ -3097,6 +3107,9 @@ msgstr "seznam proxy"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 8e18f7822..1380267f1 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -809,10 +809,20 @@ msgstr "(keine)"
 msgid "No proxy defined"
 msgstr "Kein Proxy definiert"
 
+#, fuzzy, c-format
+#| msgid "%sBar \"%s\" already exists"
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sBar \"%s\" existiert bereits"
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sFalscher Typ \"%s\" für Proxy \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy \"%s\" deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy \"%s\" gelöscht"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" hinzugefügt"
@@ -3466,9 +3476,14 @@ msgid "manage proxies"
 msgstr "Proxys verwalten"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
+#| "del <name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <name> <type> <address> <port> [<username> [<password>]] || del "
 "<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
@@ -3479,6 +3494,13 @@ msgstr "raw[list]: Auflistung aller Proxys"
 msgid "raw[add]: add a new proxy"
 msgstr "raw[add]: fügt neuen Proxy hinzu"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+"raw[addreplace]: neuen Filter anlegen oder einen schon existierenden Filter "
+"ersetzen"
+
 msgid "name: name of proxy (must be unique)"
 msgstr "name: Name des neuen Proxy (der Name darf nur einmal genutzt werden)"
 
diff --git a/po/es.po b/po/es.po
index 221ad4847..d252a55bf 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -840,10 +840,19 @@ msgstr "(ninguno)"
 msgid "No proxy defined"
 msgstr "Ningún proxy definido"
 
+#, fuzzy, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sError: el filtro \"%s\" ya existe"
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sError: tipo \"%s\" incorrecto para el proxy \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy eliminado"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" creado"
@@ -3191,8 +3200,9 @@ msgstr "gestionar los proxies"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <nombre> <tipo> <dirección> <puerto> [<usuario> [<clave>]] || "
 "del <nombre>|-all || set <nombre> <opción> <valor>"
@@ -3204,6 +3214,9 @@ msgstr "Lista de proxies:"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 0e634c706..2d598207e 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 10:12+0200\n"
-"PO-Revision-Date: 2024-06-09 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+0200\n"
+"PO-Revision-Date: 2024-06-09 14:42+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -791,10 +791,18 @@ msgstr "(aucun)"
 msgid "No proxy defined"
 msgstr "Pas de proxy défini"
 
+#, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sLe proxy \"%s\" existe déjà"
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sType invalide \"%s\" pour le proxy \"%s\""
 
+#, c-format
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy \"%s\" mis à jour"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" ajouté"
@@ -3395,11 +3403,13 @@ msgstr "gestion des proxies"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
-"list || add <nom> <type> <adresse> <port> [<utilisateur> [<mot_de_passe>]] "
-"|| del <nom>|<masque> [<nom>|<masque>...] || set <nom> <option> <valeur>"
+"list || add|addreplace <nom> <type> <adresse> <port> [<utilisateur> "
+"[<mot_de_passe>]] || del <nom>|<masque> [<nom>|<masque>...] || set <nom> "
+"<option> <valeur>"
 
 msgid "raw[list]: list all proxies"
 msgstr "raw[list] : lister tous les proxies"
@@ -3407,6 +3417,9 @@ msgstr "raw[list] : lister tous les proxies"
 msgid "raw[add]: add a new proxy"
 msgstr "raw[add] : ajouter un nouveau proxy"
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr "raw[addreplace] : ajouter ou remplacer un proxy existant"
+
 msgid "name: name of proxy (must be unique)"
 msgstr "nom : nom du proxy (doit être unique)"
 
diff --git a/po/hu.po b/po/hu.po
index ae5461891..97a58a3fd 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -756,10 +756,18 @@ msgstr "(ismeretlen)"
 msgid "No proxy defined"
 msgstr "Nincs aliasz definiálva.\n"
 
+#, fuzzy, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%s az ignore már létezik\n"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n"
 
+#, fuzzy, c-format
+msgid "Proxy \"%s\" updated"
+msgstr "a felhasználók le lettek tiltva"
+
 #, fuzzy, c-format
 msgid "Proxy \"%s\" added"
 msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
@@ -2971,8 +2979,9 @@ msgstr "pufferek kezelése"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 
 #, fuzzy
@@ -2982,6 +2991,9 @@ msgstr "Aliaszok listája:\n"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 24293d613..a77c1a517 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -756,10 +756,19 @@ msgstr "(nessuno)"
 msgid "No proxy defined"
 msgstr "Nessun proxy definito"
 
+#, fuzzy, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sErrore: il filtro \"%s\" esiste già"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sErrore: tipo \"%s\" errato per il proxy \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy eliminato"
+
 #, fuzzy, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" creato"
@@ -3080,8 +3089,9 @@ msgstr "gestione dei proxy"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <nome> <tipo> <indirizzo> <porta> [<nomeutente> [<password>]] || "
 "del <nome>|-all || set <nome> <opzione> <valore>"
@@ -3094,6 +3104,9 @@ msgstr "elenco dei proxy"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 9f0bb0fa2..dc2d0cf63 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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/"
@@ -808,10 +808,20 @@ msgstr "(無し)"
 msgid "No proxy defined"
 msgstr "プロキシが定義されていません"
 
+#, fuzzy, c-format
+#| msgid "%s%s: trigger \"%s\" already exists"
+msgid "%sProxy \"%s\" already exists"
+msgstr "%s%s: トリガ \"%s\" は既に存在します"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%1$sエラー: プロキシ \"%3$s\" に対するタイプ \"%2$s\" が間違っています"
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "プロキシを削除しました"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "プロキシ \"%s\" を追加しました"
@@ -3165,8 +3175,9 @@ msgstr "プロキシの管理"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <name> <type> <address> <port> [<username> [<password>]] || del "
 "<name>|-all || set <name> <option> <value>"
@@ -3179,6 +3190,9 @@ msgstr "プロキシリスト"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 3642ae4eb..2273f51b7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -785,10 +785,20 @@ msgstr "(brak)"
 msgid "No proxy defined"
 msgstr "Nie zdefiniowano proxy"
 
+#, fuzzy, c-format
+#| msgid "%sBar \"%s\" already exists"
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sPasek \"%s\" już istnieje"
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sZły typ \"%s\" dla pośrednika \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy \"%s\" deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Usunięto pośrednika \"%s\""
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Dodano proxy \"%s\""
@@ -3304,9 +3314,14 @@ msgid "manage proxies"
 msgstr "zarządzanie proxy"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
+#| "del <name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <nazwa> <typ> <adres> <port> [<użytkownik> [<hasło>]] || del "
 "<nazwa>|<maska> [<nazwa>|<maska>...] || set <nazwa> <opcja> <wartość>"
@@ -3317,6 +3332,11 @@ msgstr "raw[list]: wyświetla wszystkich pośredników"
 msgid "raw[add]: add a new proxy"
 msgstr "raw[add]: dodaj nowego pośrednika"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr "raw[addreplace]: dodaj lub zastąp istniejący filtr"
+
 msgid "name: name of proxy (must be unique)"
 msgstr "nazwa: nazwa pośrednika (musi być unikalna)"
 
diff --git a/po/pt.po b/po/pt.po
index 95bc5d53c..921aa2a7d 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -791,10 +791,20 @@ msgstr "(nenhum)"
 msgid "No proxy defined"
 msgstr "Nenhum proxy definido"
 
+#, fuzzy, c-format
+#| msgid "%s%s: trigger \"%s\" already exists"
+msgid "%sProxy \"%s\" already exists"
+msgstr "%s%s: o acionador \"%s\" já existe"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sErro: tipo incorreto \"%s\" do proxy \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy eliminado"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" adicionado"
@@ -3163,8 +3173,9 @@ msgstr "gerir os proxies"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <nome> <tipo> <endereço> <porta> [<utilizador> [<palavra-"
 "passe>]] || del <nome>|-all || set <nome> <opção> <valor>"
@@ -3177,6 +3188,9 @@ msgstr "lista de proxies"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ed5015af1..e7c598f92 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -795,10 +795,19 @@ msgstr "(nenhum)"
 msgid "No proxy defined"
 msgstr "Nenhum proxy definido"
 
+#, fuzzy, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sErro: filtro \"%s\" já existe"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sErro: tipo \"%s\" errado para o proxy \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Proxy excluído"
+
 #, fuzzy, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Proxy \"%s\" criado"
@@ -3121,8 +3130,9 @@ msgstr "gerenciar proxies"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <nome> <tipo> <endereço> <porta> [<nome de usuário> [<senha>]] "
 "|| del <nome>|-all || set <nome> <opção> <valor>"
@@ -3134,6 +3144,9 @@ msgstr "lista de proxys"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 8864d65e4..671afcbbb 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -770,10 +770,18 @@ msgstr "(неизвестен)"
 msgid "No proxy defined"
 msgstr "Сокращения не заданы.\n"
 
+#, fuzzy, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr "%s игнорирование уже существует\n"
+
 #, fuzzy, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%s некорректное количество аргументов команды \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "Proxy \"%s\" updated"
+msgstr "команда users отключена"
+
 #, fuzzy, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Сокращение \"%s\" => \"%s\" создано\n"
@@ -2996,8 +3004,9 @@ msgstr "управление буферами"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 
 #, fuzzy
@@ -3007,6 +3016,9 @@ msgstr "Список сокращений:\n"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 3074443f3..2ab770a08 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -782,10 +782,20 @@ msgstr "(ништа)"
 msgid "No proxy defined"
 msgstr "Није дефинисан ниједан прокси"
 
+#, fuzzy, c-format
+#| msgid "%sBar \"%s\" already exists"
+msgid "%sProxy \"%s\" already exists"
+msgstr "%sТрака „%s” већ постоји"
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sНеважећи тип „%s” за прокси „%s”"
 
+#, fuzzy, c-format
+#| msgid "Proxy \"%s\" deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Прокси „%s” је обрисан"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Додат је прокси „%s”"
@@ -3304,9 +3314,14 @@ msgid "manage proxies"
 msgstr "управљање проксијима"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
+#| "del <name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <име> <тип> <адреса> <порт> [<кориме> [<лозинка>]] || del <име>|"
 "<маска> [<име>|<маска>...] || set <име> <опција> <вредност>"
@@ -3317,6 +3332,11 @@ msgstr "raw[list]: исписује све проксије"
 msgid "raw[add]: add a new proxy"
 msgstr "raw[add]: исписује све проксије"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr "raw[addreplace]: додаје или замењује постојећи филтер"
+
 msgid "name: name of proxy (must be unique)"
 msgstr "име: име проксија (мора да буде јединствено)"
 
diff --git a/po/tr.po b/po/tr.po
index f3b5fd362..aeafabe48 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -812,10 +812,20 @@ msgstr "(hiçbiri)"
 msgid "No proxy defined"
 msgstr "Hiçbir vekil tanımlanmadı"
 
+#, fuzzy, c-format
+#| msgid "%s%s: trigger \"%s\" already exists"
+msgid "%sProxy \"%s\" already exists"
+msgstr "%s%s: \"%s\" tetiği halihazırda mevcut"
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr "%sŞu vekil için yanlış tür \"%s\": \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Proxy deleted"
+msgid "Proxy \"%s\" updated"
+msgstr "Vekil silindi"
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr "Vekil \"%s\" eklendi"
@@ -3203,8 +3213,9 @@ msgstr "vekilleri yönet"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 "list || add <ad> <tür> <adres> <kapı> [<kullanıcıadı> [<parola>]] || del "
 "<ad>|-all || set <tür> <seçenek> <değer>"
@@ -3217,6 +3228,9 @@ msgstr "vekillerin listesi"
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/po/weechat.pot b/po/weechat.pot
index ad4da5d2b..c67327b6d 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 10:12+0200\n"
+"POT-Creation-Date: 2024-06-09 14:41+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"
@@ -699,10 +699,18 @@ msgstr ""
 msgid "No proxy defined"
 msgstr ""
 
+#, c-format
+msgid "%sProxy \"%s\" already exists"
+msgstr ""
+
 #, c-format
 msgid "%sInvalid type \"%s\" for proxy \"%s\""
 msgstr ""
 
+#, c-format
+msgid "Proxy \"%s\" updated"
+msgstr ""
+
 #, c-format
 msgid "Proxy \"%s\" added"
 msgstr ""
@@ -2793,8 +2801,9 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list || add <name> <type> <address> <port> [<username> [<password>]] || del "
-"<name>|<mask> [<name>|<mask>...] || set <name> <option> <value>"
+"list || add|addreplace <name> <type> <address> <port> [<username> "
+"[<password>]] || del <name>|<mask> [<name>|<mask>...] || set <name> <option> "
+"<value>"
 msgstr ""
 
 msgid "raw[list]: list all proxies"
@@ -2803,6 +2812,9 @@ msgstr ""
 msgid "raw[add]: add a new proxy"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing proxy"
+msgstr ""
+
 msgid "name: name of proxy (must be unique)"
 msgstr ""
 
diff --git a/src/core/core-command.c b/src/core/core-command.c
index 02a103e58..4a129f635 100644
--- a/src/core/core-command.c
+++ b/src/core/core-command.c
@@ -5507,7 +5507,7 @@ COMMAND_CALLBACK(proxy)
 {
     struct t_proxy *ptr_proxy, *ptr_next_proxy;
     char *error, *name;
-    int type, i;
+    int type, i, update;
     long value;
 
     /* make C compiler happy */
@@ -5523,9 +5523,28 @@ COMMAND_CALLBACK(proxy)
     }
 
     /* add a new proxy */
-    if (string_strcmp (argv[1], "add") == 0)
+    if ((string_strcmp (argv[1], "add") == 0)
+        || (string_strcmp (argv[1], "addreplace") == 0))
     {
         COMMAND_MIN_ARGS(6, argv[1]);
+        update = 0;
+        ptr_proxy = proxy_search (argv[2]);
+        if (ptr_proxy)
+        {
+            if (string_strcmp (argv[1], "addreplace") == 0)
+            {
+                update = 1;
+                proxy_free (ptr_proxy);
+            }
+            else
+            {
+                gui_chat_printf (NULL,
+                                 _("%sProxy \"%s\" already exists"),
+                                 gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                                 argv[2]);
+                return WEECHAT_RC_OK;
+            }
+        }
         type = proxy_search_type (argv[3]);
         if (type < 0)
         {
@@ -5545,8 +5564,10 @@ COMMAND_CALLBACK(proxy)
                            (argc >= 7) ? argv[6] : NULL,
                            (argc >= 8) ? argv_eol[7] : NULL))
             {
-                gui_chat_printf (NULL, _("Proxy \"%s\" added"),
-                                 argv[2]);
+                gui_chat_printf (
+                    NULL,
+                    (update) ? _("Proxy \"%s\" updated") : _("Proxy \"%s\" added"),
+                    argv[2]);
             }
             else
             {
@@ -9103,12 +9124,14 @@ command_init ()
         N_("manage proxies"),
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated */
         N_("list"
-           " || add <name> <type> <address> <port> [<username> [<password>]]"
+           " || add|addreplace <name> <type> <address> <port> "
+           "[<username> [<password>]]"
            " || del <name>|<mask> [<name>|<mask>...]"
            " || set <name> <option> <value>"),
         CMD_ARGS_DESC(
             N_("raw[list]: list all proxies"),
             N_("raw[add]: add a new proxy"),
+            N_("raw[addreplace]: add or replace an existing proxy"),
             N_("name: name of proxy (must be unique)"),
             N_("type: http, socks4 or socks5"),
             N_("address: IP or hostname"),
@@ -9133,7 +9156,7 @@ command_init ()
             N_("  delete a proxy:"),
             AI("    /proxy del myproxy")),
         "list"
-        " || add %(proxies_names) http|socks4|socks5"
+        " || add|addreplace %(proxies_names) http|socks4|socks5"
         " || del %(proxies_names)|%*"
         " || set %(proxies_names) %(proxies_options)",
         &command_proxy, NULL, NULL);