From 6499d77e1deabad84ad87c91fd20b4adfca8f52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sun, 9 Jun 2024 10:06:10 +0200
Subject: [PATCH] alias: add options `addreplace` and `addreplacecompletion` in
 command `/alias` (issue #2095)

The commands `/alias add` and `/alias addcompletion` now return an error if the
alias already exists.
---
 CHANGELOG.md                      |   1 +
 po/cs.po                          |  55 ++++++++------
 po/de.po                          |  70 ++++++++++++------
 po/es.po                          |  55 ++++++++------
 po/fr.po                          |  66 ++++++++++-------
 po/hu.po                          |  49 ++++++++-----
 po/it.po                          |  55 ++++++++------
 po/ja.po                          |  57 +++++++++------
 po/pl.po                          |  62 +++++++++++-----
 po/pt.po                          |  57 +++++++++------
 po/pt_BR.po                       |  55 ++++++++------
 po/ru.po                          |  49 ++++++++-----
 po/sr.po                          |  63 +++++++++++-----
 po/tr.po                          |  57 +++++++++------
 po/weechat.pot                    |  43 +++++++----
 src/plugins/alias/alias-command.c | 116 +++++++++++++++++++++++-------
 16 files changed, 605 insertions(+), 305 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b4c1b298..50cdba2c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,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))
 - 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 882f25e3e..58634e9c7 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6429,8 +6429,14 @@ msgstr "%s%s: nekorektní znaková sada: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: chyba vytváření aliasu \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" vytvořen"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "Alias \"%s\" => \"%s\" vytvořen"
 
 #, c-format
@@ -6450,6 +6456,10 @@ msgstr "Žádný alias odpovídající \"%s\" nenalezen"
 msgid "No alias defined"
 msgstr "Žádné aliasy nejsou definovány"
 
+#, fuzzy, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%s%s: vzorec přesměrování \"%s\" již existuje"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" odebrán"
@@ -6458,10 +6468,6 @@ msgstr "Alias \"%s\" odebrán"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" nenalezen"
 
-#, fuzzy, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%s%s: vzorec přesměrování \"%s\" již existuje"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6477,9 +6483,10 @@ msgstr "vypíše, přídá nebo odebere IRC servery"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list || add <jméno> <typ> <adresa> <port> [<uživatel> [<heslo>]] || del "
 "<jméno>|-all || set <jméno> <volba> <hodnota>"
@@ -6490,22 +6497,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "hodnota aliasu"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "hodnota aliasu"
 
 #, c-format
 msgid ""
@@ -6519,6 +6525,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 8100d9a76..e307bc08e 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -7279,10 +7279,16 @@ msgstr "%s%s: ungültiger Alias-Name: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: Fehler beim Erstellen von Alias \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
 msgstr "Alias \"%s\" => \"%s\" angelegt"
 
+#, fuzzy, c-format
+#| msgid "Alias converted to lower case: \"%s\" => \"%s\""
+msgid "Alias created: \"%s\" => \"%s\""
+msgstr "Alias in Kleinbuchstaben umgewandelt: \"%s\" => \"%s\""
+
 #, c-format
 msgid "Aliases with \"%s\":"
 msgstr "Alternativnamen mit \"%s\":"
@@ -7300,6 +7306,10 @@ msgstr "Keinen passenden Alias zu \"%s\" gefunden"
 msgid "No alias defined"
 msgstr "Keine Alias definiert"
 
+#, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sAlias \"%s\" existiert bereits"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" entfernt"
@@ -7308,10 +7318,6 @@ msgstr "Alias \"%s\" entfernt"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" nicht gefunden"
 
-#, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sAlias \"%s\" existiert bereits"
-
 #, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr "Alias \"%s\" wurde umbenannt. Der neue Name lautet \"%s\""
@@ -7320,10 +7326,16 @@ msgid "list, add or remove command aliases"
 msgstr "auflisten, hinzufügen oder entfernen von Alternativnamen"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
+#| "<completion> <name> [<command>[;<command>...]] || del <name>|<mask> "
+#| "[<name>|<mask>...] || rename <name> <new_name> || missing"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
 "<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
@@ -7337,24 +7349,29 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr "raw[add]: fügt einen Alternativbefehl hinzu"
 
-msgid "name: name of alias"
-msgstr "Name: Name des Alternativbefehls"
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
+"raw[addreplace]: neuen Filter anlegen oder einen schon existierenden Filter "
+"ersetzen"
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 "raw[addcompletion]: fügt einen Alternativbefehl, mit einer "
 "benutzerdefinierten Vervollständigung, hinzu"
 
-msgid "raw[del]: delete aliases"
-msgstr "raw[del]: entfernt einen Alternativbefehl"
-
-msgid "raw[rename]: rename an alias"
-msgstr "raw[rename]: ein Alias umbenennen"
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
+#, fuzzy
+#| msgid "raw[addcompletion]: add an alias with a custom completion"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
-"raw[missing]: fehlende Aliase hinzufügen (unter Verwendung der "
-"Standardaliasen)"
+"raw[addcompletion]: fügt einen Alternativbefehl, mit einer "
+"benutzerdefinierten Vervollständigung, hinzu"
+
+msgid "name: name of alias"
+msgstr "Name: Name des Alternativbefehls"
 
 #, c-format
 msgid ""
@@ -7374,6 +7391,17 @@ msgstr ""
 "Befehl: Name des Befehls, mit Argumenten (mehrere Befehle können durch "
 "Semikolon voneinander getrennt werden)"
 
+msgid "raw[del]: delete aliases"
+msgstr "raw[del]: entfernt einen Alternativbefehl"
+
+msgid "raw[rename]: rename an alias"
+msgstr "raw[rename]: ein Alias umbenennen"
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+"raw[missing]: fehlende Aliase hinzufügen (unter Verwendung der "
+"Standardaliasen)"
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 "Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden "
diff --git a/po/es.po b/po/es.po
index bdbe775f1..16c97b0d2 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6602,8 +6602,14 @@ msgstr "%s%s: set de caracteres inválido: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: error al crear el alias \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" creado"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "Alias \"%s\" => \"%s\" creado"
 
 #, fuzzy, c-format
@@ -6625,6 +6631,10 @@ msgstr "Ningún alias encontrado con \"%s\""
 msgid "No alias defined"
 msgstr "Ningún alias definido"
 
+#, fuzzy, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sError: el filtro \"%s\" ya existe"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" eliminado"
@@ -6633,10 +6643,6 @@ msgstr "Alias \"%s\" eliminado"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" no encontrado"
 
-#, fuzzy, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sError: el filtro \"%s\" ya existe"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6652,9 +6658,10 @@ msgstr "lista, añade o elimina servidores IRC"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list || add <nombre> <tipo> <dirección> <puerto> [<usuario> [<clave>]] || "
 "del <nombre>|-all || set <nombre> <opción> <valor>"
@@ -6665,22 +6672,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "valor del alias"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "valor del alias"
 
 #, c-format
 msgid ""
@@ -6694,6 +6700,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index cb232aa2b..73c09293e 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 09:07+0200\n"
-"PO-Revision-Date: 2024-06-09 09:08+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+0200\n"
+"PO-Revision-Date: 2024-06-09 09:44+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -7136,8 +7136,12 @@ msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s : erreur en création de l'alias \"%s\" => \"%s\""
 
 #, c-format
-msgid "Alias \"%s\" => \"%s\" created"
-msgstr "Alias \"%s\" => \"%s\" créé"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Alias mis à jour : \"%s\" => \"%s\""
+
+#, c-format
+msgid "Alias created: \"%s\" => \"%s\""
+msgstr "Alias créé : \"%s\" => \"%s\""
 
 #, c-format
 msgid "Aliases with \"%s\":"
@@ -7156,6 +7160,10 @@ msgstr "Pas d'alias trouvé correspondant à \"%s\""
 msgid "No alias defined"
 msgstr "Aucun alias défini"
 
+#, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sL'alias \"%s\" existe déjà"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" supprimé"
@@ -7164,10 +7172,6 @@ msgstr "Alias \"%s\" supprimé"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" non trouvé"
 
-#, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sL'alias \"%s\" existe déjà"
-
 #, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr "L'alias \"%s\" a été renommé en \"%s\""
@@ -7177,13 +7181,15 @@ msgstr "lister, ajouter ou retirer des alias de commande"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
-"list [<nom>] || add <nom> [<commande>[;<commande>...]] || addcompletion "
-"<complétion> <nom> [<commande>[;<commande>...]] || del <nom>|<masque> [<nom>|"
-"<masque>...] || rename <nom> <nouveau_nom> || missing"
+"list [<nom>] || add|addreplace <nom> [<commande>[;<commande>...]] || "
+"addcompletion|addreplacecompletion <complétion> <nom> [<commande>[;"
+"<commande>...]] || del <nom>|<masque> [<nom>|<masque>...] || rename <nom> "
+"<nouveau_nom> || missing"
 
 msgid "raw[list]: list aliases (without argument, this list is displayed)"
 msgstr ""
@@ -7192,23 +7198,22 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr "raw[add] : ajouter un alias"
 
-msgid "name: name of alias"
-msgstr "nom : nom de l'alias"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr "raw[addreplace] : ajouter ou remplacer un alias existant"
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 "raw[addcompletion] : ajouter un alias avec une complétion personnalisée"
 
-msgid "raw[del]: delete aliases"
-msgstr "raw[del] : supprimer des alias"
-
-msgid "raw[rename]: rename an alias"
-msgstr "raw[rename] : renommer un alias"
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
-"raw[missing] : ajouter les alias manquants (en utilisant les alias par "
-"défaut)"
+"raw[addreplacecompletion] : ajouter ou remplacer un alias existant avec une "
+"complétion personnalisée"
+
+msgid "name: name of alias"
+msgstr "nom : nom de l'alias"
 
 #, c-format
 msgid ""
@@ -7227,6 +7232,17 @@ msgstr ""
 "commande : nom de la commande avec les paramètres (plusieurs commandes "
 "peuvent être séparées par des points-virgules)"
 
+msgid "raw[del]: delete aliases"
+msgstr "raw[del] : supprimer des alias"
+
+msgid "raw[rename]: rename an alias"
+msgstr "raw[rename] : renommer un alias"
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+"raw[missing] : ajouter les alias manquants (en utilisant les alias par "
+"défaut)"
+
 msgid "In command, special variables are replaced:"
 msgstr "Dans la commande, les variables spéciales sont remplacées :"
 
diff --git a/po/hu.po b/po/hu.po
index 0da86c713..86b0df5a4 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6100,7 +6100,11 @@ msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s nincs elég memória az információs pult üzenethez\n"
 
 #, fuzzy, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
+
+#, fuzzy, c-format
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
 
 #, fuzzy, c-format
@@ -6123,6 +6127,10 @@ msgstr "Nem található '%s' szerver.\n"
 msgid "No alias defined"
 msgstr "Nincs aliasz definiálva.\n"
 
+#, fuzzy, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%s az ignore már létezik\n"
+
 #, fuzzy, c-format
 msgid "Alias \"%s\" removed"
 msgstr "A \"%s\" aliasz eltávolítva\n"
@@ -6131,10 +6139,6 @@ msgstr "A \"%s\" aliasz eltávolítva\n"
 msgid "%sAlias \"%s\" not found"
 msgstr "%s cím \"%s\" nem található\n"
 
-#, fuzzy, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%s az ignore már létezik\n"
-
 #, fuzzy, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr "a felhasználók le lettek tiltva"
@@ -6145,9 +6149,10 @@ msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 
 msgid "raw[list]: list aliases (without argument, this list is displayed)"
@@ -6156,21 +6161,20 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-msgid "name: name of alias"
-msgstr "Aliaszok listája:\n"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+msgid "name: name of alias"
+msgstr "Aliaszok listája:\n"
 
 #, c-format
 msgid ""
@@ -6184,6 +6188,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index aa2c965a7..ad3840d13 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6557,8 +6557,14 @@ msgstr "%s%s: set di caratter invalido: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: errore nella creazione dell'alias \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" creato"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "Alias \"%s\" => \"%s\" creato"
 
 #, fuzzy, c-format
@@ -6580,6 +6586,10 @@ msgstr "Nessun alias corrispondente a \"%s\" trovato"
 msgid "No alias defined"
 msgstr "Nessun alias definito"
 
+#, fuzzy, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sErrore: il filtro \"%s\" esiste già"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" eliminato"
@@ -6588,10 +6598,6 @@ msgstr "Alias \"%s\" eliminato"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" non trovato"
 
-#, fuzzy, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sErrore: il filtro \"%s\" esiste già"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6607,9 +6613,10 @@ msgstr "elenca, aggiunge o rimuove server IRC"
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list || add <nome> <tipo> <indirizzo> <porta> [<nomeutente> [<password>]] || "
 "del <nome>|-all || set <nome> <opzione> <valore>"
@@ -6620,22 +6627,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "valore dell'alias"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "valore dell'alias"
 
 #, c-format
 msgid ""
@@ -6649,6 +6655,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 7a6605204..47c0c1760 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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/"
@@ -6736,8 +6736,14 @@ msgstr "%s%s: 別名が間違っています: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: 別名 \"%s\" => \"%s\" 作成中にエラー"
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "別名 \"%s\" => \"%s\" を作成しました"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "別名 \"%s\" => \"%s\" を作成しました"
 
 #, c-format
@@ -6757,6 +6763,11 @@ msgstr "\"%s\" にマッチする別名が見つかりません"
 msgid "No alias defined"
 msgstr "別名が定義されていません"
 
+#, fuzzy, c-format
+#| msgid "%s%s: trigger \"%s\" already exists"
+msgid "%sAlias \"%s\" already exists"
+msgstr "%s%s: トリガ \"%s\" は既に存在します"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "別名 \"%s\" が削除されました"
@@ -6765,11 +6776,6 @@ msgstr "別名 \"%s\" が削除されました"
 msgid "%sAlias \"%s\" not found"
 msgstr "%s別名 \"%s\" が見つかりません"
 
-#, fuzzy, c-format
-#| msgid "%s%s: trigger \"%s\" already exists"
-msgid "%sAlias \"%s\" already exists"
-msgstr "%s%s: トリガ \"%s\" は既に存在します"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6785,9 +6791,10 @@ msgstr "別名コマンドのリストアップ、追加、削除"
 #| "<completion> <alias> [<command>[;<command>...]] || del <alias> "
 #| "[<alias>...]"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list [<alias>] || add <alias> [<command>[;<command>...]] || addcompletion "
 "<completion> <alias> [<command>[;<command>...]] || del <alias> [<alias>...]"
@@ -6798,22 +6805,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "別名の値"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "別名の値"
 
 #, c-format
 msgid ""
@@ -6833,6 +6839,15 @@ msgstr ""
 "正規表現置換が行われた後に条件が満足された場合に実行するコマンド (多くのコマ"
 "ンドを実行するにはセミコロンで区切ってください)"
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 7b74e55b2..5387cde14 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: 2024-06-09 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+0200\n"
 "PO-Revision-Date: 2024-06-01 22:06+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6920,10 +6920,16 @@ msgstr "%s%s: nieprawidłowe nazwa aliasu: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: błąd podczas tworzenia aliasu \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
 msgstr "Utworzono alias \"%s\" => \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Alias converted to lower case: \"%s\" => \"%s\""
+msgid "Alias created: \"%s\" => \"%s\""
+msgstr "Skonwertowano alias na małe litery: „%s” => „%s”"
+
 #, c-format
 msgid "Aliases with \"%s\":"
 msgstr "Aliasy z \"%s\":"
@@ -6941,6 +6947,10 @@ msgstr "Nie znaleziono aliasu pasującego do \"%s\""
 msgid "No alias defined"
 msgstr "Nie zdefiniowano aliasu"
 
+#, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sAlias \"%s\" już istnieje"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" został usunięty"
@@ -6949,10 +6959,6 @@ msgstr "Alias \"%s\" został usunięty"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" nie został znaleziony"
 
-#, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sAlias \"%s\" już istnieje"
-
 #, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr "Zmieniono nazwę aliasu \"%s\" na \"%s\""
@@ -6961,10 +6967,16 @@ msgid "list, add or remove command aliases"
 msgstr "wyświetla, dodaje lub usuwa aliasy komend"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
+#| "<completion> <name> [<command>[;<command>...]] || del <name>|<mask> "
+#| "[<name>|<mask>...] || rename <name> <new_name> || missing"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list [<nazwa>] || add <nazwa> [<komenda>[;<komenda>...]] || addcompletion "
 "<dopełnienie> <nazwa> [<komenda>[;<komenda>...]] || del <nazwa>|<maska> "
@@ -6977,20 +6989,23 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr "raw[add]: dodaj alias"
 
-msgid "name: name of alias"
-msgstr "nazwa: nazwa aliasu"
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr "raw[addreplace]: dodaj lub zastąp istniejący filtr"
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr "raw[addcompletion]: dodaj alias z niestandardowym dopełnieniem"
 
-msgid "raw[del]: delete aliases"
-msgstr "raw[del]: usuń aliasy"
+#, fuzzy
+#| msgid "raw[addcompletion]: add an alias with a custom completion"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
+msgstr "raw[addcompletion]: dodaj alias z niestandardowym dopełnieniem"
 
-msgid "raw[rename]: rename an alias"
-msgstr "raw[rename]: zmień nazwę aliasu"
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr "raw[missing]: dodaj brakujące aliasy (używając domyślnych aliasów)"
+msgid "name: name of alias"
+msgstr "nazwa: nazwa aliasu"
 
 #, c-format
 msgid ""
@@ -7009,6 +7024,15 @@ msgstr ""
 "komenda: komenda do wykonania z argumentami (wiele komend można oddzielić "
 "średnikami)"
 
+msgid "raw[del]: delete aliases"
+msgstr "raw[del]: usuń aliasy"
+
+msgid "raw[rename]: rename an alias"
+msgstr "raw[rename]: zmień nazwę aliasu"
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr "raw[missing]: dodaj brakujące aliasy (używając domyślnych aliasów)"
+
 msgid "In command, special variables are replaced:"
 msgstr "W komendach zamieniane są specjalne wartości:"
 
diff --git a/po/pt.po b/po/pt.po
index 3ae3b5890..902d32725 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -6795,8 +6795,14 @@ msgstr "%s%s: nome de alias inválido: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: erro ao criar alias \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" criado"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "Alias \"%s\" => \"%s\" criado"
 
 #, c-format
@@ -6816,6 +6822,11 @@ msgstr "Nenhum alias de \"%s\" encontrado"
 msgid "No alias defined"
 msgstr "Nenhum alias definido"
 
+#, fuzzy, c-format
+#| msgid "%s%s: trigger \"%s\" already exists"
+msgid "%sAlias \"%s\" already exists"
+msgstr "%s%s: o acionador \"%s\" já existe"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Alias \"%s\" removido"
@@ -6824,11 +6835,6 @@ msgstr "Alias \"%s\" removido"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAlias \"%s\" não encontrado"
 
-#, fuzzy, c-format
-#| msgid "%s%s: trigger \"%s\" already exists"
-msgid "%sAlias \"%s\" already exists"
-msgstr "%s%s: o acionador \"%s\" já existe"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6844,9 +6850,10 @@ msgstr "listar, adicionar ou remover alias de comandos"
 #| "<completion> <alias> [<command>[;<command>...]] || del <alias> "
 #| "[<alias>...]"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list [<alias>] || add <alias> [<comando>[;<comando>...]] || addcompletion "
 "<completação> <alias> [<comando>[;<comando>...]] || del <alias> [<alias>...]"
@@ -6857,22 +6864,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "valor do alias"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "valor do alias"
 
 #, c-format
 msgid ""
@@ -6892,6 +6898,15 @@ msgstr ""
 "comandos a executar se as condições estiverem bem, depois de substituir as "
 "expressões regulares (pode separar vários comandos por ponto e vírgula)"
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a0c9fd688..aa58bad5f 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6470,8 +6470,14 @@ msgstr "%s%s: charset inválido: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: erro ao criar atalho \"%s\" => \"%s\""
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Atalho \"%s\" => \"%s\" criado"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "Atalho \"%s\" => \"%s\" criado"
 
 #, c-format
@@ -6493,6 +6499,10 @@ msgstr "Nenhum atalho semelhante a \"%s\" foi encontrado"
 msgid "No alias defined"
 msgstr "Nenhum atalho definido"
 
+#, fuzzy, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sErro: filtro \"%s\" já existe"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Atalho \"%s\" removido"
@@ -6501,10 +6511,6 @@ msgstr "Atalho \"%s\" removido"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sAtalho \"%s\" não encontrado"
 
-#, fuzzy, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sErro: filtro \"%s\" já existe"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6519,9 +6525,10 @@ msgstr ""
 #| "list || add <name> <type> <address> <port> [<username> [<password>]] || "
 #| "del <name>|-all || set <name> <option> <value>"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list || add <nome> <tipo> <endereço> <porta> [<nome de usuário> [<senha>]] "
 "|| del <nome>|-all || set <nome> <opção> <valor>"
@@ -6532,22 +6539,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "valor do atalho"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "valor do atalho"
 
 #, c-format
 msgid ""
@@ -6561,6 +6567,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index edeff6b76..c48034f93 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6141,7 +6141,11 @@ msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s недостаточно памяти для сообщения в строке информации\n"
 
 #, fuzzy, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "Сокращение \"%s\" => \"%s\" создано\n"
+
+#, fuzzy, c-format
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "Сокращение \"%s\" => \"%s\" создано\n"
 
 #, fuzzy, c-format
@@ -6164,6 +6168,10 @@ msgstr "Серверы с '%s' не найдены.\n"
 msgid "No alias defined"
 msgstr "Сокращения не заданы.\n"
 
+#, fuzzy, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%s игнорирование уже существует\n"
+
 #, fuzzy, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Сокращение \"%s\" удалено\n"
@@ -6172,10 +6180,6 @@ msgstr "Сокращение \"%s\" удалено\n"
 msgid "%sAlias \"%s\" not found"
 msgstr "%s адрес \"%s\" не найден\n"
 
-#, fuzzy, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%s игнорирование уже существует\n"
-
 #, fuzzy, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr "команда users отключена"
@@ -6186,9 +6190,10 @@ msgstr "перечислить, добавить или удалить серв
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 
 msgid "raw[list]: list aliases (without argument, this list is displayed)"
@@ -6197,21 +6202,20 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-msgid "name: name of alias"
-msgstr "Список сокращений:\n"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+msgid "name: name of alias"
+msgstr "Список сокращений:\n"
 
 #, c-format
 msgid ""
@@ -6225,6 +6229,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 58af46e04..2b5c5b34b 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6911,10 +6911,16 @@ msgstr "%s%s: неважеће име алијаса: „%s”"
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: грешка у креирању алијаса „%s” => „%s”"
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
 msgstr "Креиран је алијас „%s” => „%s”"
 
+#, fuzzy, c-format
+#| msgid "Alias converted to lower case: \"%s\" => \"%s\""
+msgid "Alias created: \"%s\" => \"%s\""
+msgstr "Алијас је претворен у мала слова: „%s” => „%s”"
+
 #, c-format
 msgid "Aliases with \"%s\":"
 msgstr "Алијаси са „%s”:"
@@ -6932,6 +6938,10 @@ msgstr "Ниједан алијас се не подудара са „%s”"
 msgid "No alias defined"
 msgstr "Није дефинисан ниједан алијас"
 
+#, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr "%sАлијас „%s” већ постоји"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "Уклоњен је алијас „%s”"
@@ -6940,10 +6950,6 @@ msgstr "Уклоњен је алијас „%s”"
 msgid "%sAlias \"%s\" not found"
 msgstr "%sАлијас „%s” није пронађен"
 
-#, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr "%sАлијас „%s” већ постоји"
-
 #, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr "Алијасу „%s” је промењено име на „%s”"
@@ -6952,10 +6958,16 @@ msgid "list, add or remove command aliases"
 msgstr "исписује, додаје или уклања алијасе команди"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
+#| "<completion> <name> [<command>[;<command>...]] || del <name>|<mask> "
+#| "[<name>|<mask>...] || rename <name> <new_name> || missing"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list [<име>] || add <име> [<команда>[;<команда>...]] || addcompletion "
 "<довршавање> <име> [<команда>[;<команда>...]] || del <име>|<маска> "
@@ -6967,21 +6979,25 @@ msgstr "raw[list]: исписује алијасе (без аргумента, 
 msgid "raw[add]: add an alias"
 msgstr "raw[add]: додавање алијаса"
 
-msgid "name: name of alias"
-msgstr "име: име алијаса"
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr "raw[addreplace]: додаје или замењује постојећи филтер"
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 "raw[addcompletion]: додавање алијаса са кориснички дефинисаним довршавањем"
 
-msgid "raw[del]: delete aliases"
-msgstr "raw[del]: брисање алијаса"
+#, fuzzy
+#| msgid "raw[addcompletion]: add an alias with a custom completion"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
+msgstr ""
+"raw[addcompletion]: додавање алијаса са кориснички дефинисаним довршавањем"
 
-msgid "raw[rename]: rename an alias"
-msgstr "raw[rename]: промена имена алијаса"
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr "raw[missing]: додаје алијасе који недостају (користећи подразумеване)"
+msgid "name: name of alias"
+msgstr "име: име алијаса"
 
 #, c-format
 msgid ""
@@ -6999,6 +7015,15 @@ msgstr ""
 "команда: име команде са аргументима (више команди може да се раздвоји тачка "
 "запетама)"
 
+msgid "raw[del]: delete aliases"
+msgstr "raw[del]: брисање алијаса"
+
+msgid "raw[rename]: rename an alias"
+msgstr "raw[rename]: промена имена алијаса"
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr "raw[missing]: додаје алијасе који недостају (користећи подразумеване)"
+
 msgid "In command, special variables are replaced:"
 msgstr "У команди се замењују специјалне променљиве:"
 
diff --git a/po/tr.po b/po/tr.po
index 3d8155533..69933984b 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -6805,8 +6805,14 @@ msgstr "%s%s: geçersiz arma adı: \"%s\""
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: \"%s\" => \"%s\" arması oluşturulurken hata"
 
-#, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr "\"%s\" => \"%s\" arması oluşturuldu"
+
+#, fuzzy, c-format
+#| msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr "\"%s\" => \"%s\" arması oluşturuldu"
 
 #, c-format
@@ -6826,6 +6832,11 @@ msgstr "\"%s\" ile eşleşen bir arma bulunamadı"
 msgid "No alias defined"
 msgstr "Bir arma tanımlı değil"
 
+#, fuzzy, c-format
+#| msgid "%s%s: trigger \"%s\" already exists"
+msgid "%sAlias \"%s\" already exists"
+msgstr "%s%s: \"%s\" tetiği halihazırda mevcut"
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr "\"%s\" arması kaldırıldı"
@@ -6834,11 +6845,6 @@ msgstr "\"%s\" arması kaldırıldı"
 msgid "%sAlias \"%s\" not found"
 msgstr "%s\"%s\" arması bulunamadı"
 
-#, fuzzy, c-format
-#| msgid "%s%s: trigger \"%s\" already exists"
-msgid "%sAlias \"%s\" already exists"
-msgstr "%s%s: \"%s\" tetiği halihazırda mevcut"
-
 #, fuzzy, c-format
 #| msgid "Layout \"%s\" has been renamed to \"%s\""
 msgid "Alias \"%s\" has been renamed to \"%s\""
@@ -6854,9 +6860,10 @@ msgstr "komut armalarını listele, ekle veya kaldır"
 #| "<completion> <alias> [<command>[;<command>...]] || del <alias> "
 #| "[<alias>...]"
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 "list [<arma>] || add <arma> [<komut>[;<komut>...]] || addcompletion "
 "<tamamlama> <arma> [<komut>[;<komut>...]] || del <arma> [<arma>...]"
@@ -6867,22 +6874,21 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-#, fuzzy
-#| msgid "value of alias"
-msgid "name: name of alias"
-msgstr "arma değeri"
+msgid "raw[addreplace]: add or replace an existing alias"
+msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
-msgstr ""
+#, fuzzy
+#| msgid "value of alias"
+msgid "name: name of alias"
+msgstr "arma değeri"
 
 #, c-format
 msgid ""
@@ -6902,6 +6908,15 @@ msgstr ""
 "düzenli ifade değiştirmelerinden sonra koşullar sağlanırsa çalıştırılacak "
 "komutlar (birden çok komut noktalı virgül ile ayrılabilir)"
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 496f567e8..e28151c5b 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 09:07+0200\n"
+"POT-Creation-Date: 2024-06-09 10:04+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"
@@ -5683,7 +5683,11 @@ msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr ""
 
 #, c-format
-msgid "Alias \"%s\" => \"%s\" created"
+msgid "Alias updated: \"%s\" => \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Alias created: \"%s\" => \"%s\""
 msgstr ""
 
 #, c-format
@@ -5703,6 +5707,10 @@ msgstr ""
 msgid "No alias defined"
 msgstr ""
 
+#, c-format
+msgid "%sAlias \"%s\" already exists"
+msgstr ""
+
 #, c-format
 msgid "Alias \"%s\" removed"
 msgstr ""
@@ -5711,10 +5719,6 @@ msgstr ""
 msgid "%sAlias \"%s\" not found"
 msgstr ""
 
-#, c-format
-msgid "%sAlias \"%s\" already exists"
-msgstr ""
-
 #, c-format
 msgid "Alias \"%s\" has been renamed to \"%s\""
 msgstr ""
@@ -5724,9 +5728,10 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list [<name>] || add <name> [<command>[;<command>...]] || addcompletion "
-"<completion> <name> [<command>[;<command>...]] || del <name>|<mask> [<name>|"
-"<mask>...] || rename <name> <new_name> || missing"
+"list [<name>] || add|addreplace <name> [<command>[;<command>...]] || "
+"addcompletion|addreplacecompletion <completion> <name> [<command>[;"
+"<command>...]] || del <name>|<mask> [<name>|<mask>...] || rename <name> "
+"<new_name> || missing"
 msgstr ""
 
 msgid "raw[list]: list aliases (without argument, this list is displayed)"
@@ -5735,19 +5740,18 @@ msgstr ""
 msgid "raw[add]: add an alias"
 msgstr ""
 
-msgid "name: name of alias"
+msgid "raw[addreplace]: add or replace an existing alias"
 msgstr ""
 
 msgid "raw[addcompletion]: add an alias with a custom completion"
 msgstr ""
 
-msgid "raw[del]: delete aliases"
+msgid ""
+"raw[addreplacecompletion]: add or replace an existing alias with a custom "
+"completion"
 msgstr ""
 
-msgid "raw[rename]: rename an alias"
-msgstr ""
-
-msgid "raw[missing]: add missing aliases (using default aliases)"
+msgid "name: name of alias"
 msgstr ""
 
 #, c-format
@@ -5762,6 +5766,15 @@ msgid ""
 "semicolons)"
 msgstr ""
 
+msgid "raw[del]: delete aliases"
+msgstr ""
+
+msgid "raw[rename]: rename an alias"
+msgstr ""
+
+msgid "raw[missing]: add missing aliases (using default aliases)"
+msgstr ""
+
 msgid "In command, special variables are replaced:"
 msgstr ""
 
diff --git a/src/plugins/alias/alias-command.c b/src/plugins/alias/alias-command.c
index f72d6bc3e..782c350da 100644
--- a/src/plugins/alias/alias-command.c
+++ b/src/plugins/alias/alias-command.c
@@ -33,7 +33,7 @@
 
 void
 alias_command_add (const char *alias_name, const char *command,
-                   const char *completion)
+                   const char *completion, int update)
 {
     struct t_config_option *ptr_option;
 
@@ -65,7 +65,9 @@ alias_command_add (const char *alias_name, const char *command,
 
     /* display message */
     weechat_printf (NULL,
-                    _("Alias \"%s\" => \"%s\" created"),
+                    (update) ?
+                    _("Alias updated: \"%s\" => \"%s\"") :
+                    _("Alias created: \"%s\" => \"%s\""),
                     alias_name, command);
 }
 
@@ -81,7 +83,7 @@ alias_command_cb (const void *pointer, void *data,
     char *ptr_alias_name, *ptr_alias_name2, *name;
     struct t_alias *ptr_alias, *ptr_alias2, *ptr_next_alias;
     struct t_config_option *ptr_option;
-    int alias_found, i;
+    int alias_found, i, update;
 
     /* make C compiler happy */
     (void) pointer;
@@ -169,25 +171,79 @@ alias_command_cb (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, "add");
-        alias_command_add (
-            (weechat_string_is_command_char (argv[2])) ?
-            (char *)weechat_utf8_next_char (argv[2]) : argv[2],
-            argv_eol[3],
-            NULL);
+        WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
+        update = 0;
+        ptr_alias_name = (weechat_string_is_command_char (argv[2])) ?
+            (char *)weechat_utf8_next_char (argv[2]) : argv[2];
+        ptr_alias = alias_search (ptr_alias_name);
+        if (ptr_alias)
+        {
+            if (weechat_strcmp (argv[1], "addreplace") == 0)
+            {
+                alias_free (ptr_alias);
+                ptr_option = weechat_config_search_option (
+                    alias_config_file,
+                    alias_config_section_cmd,
+                    ptr_alias_name);
+                weechat_config_option_free (ptr_option);
+                ptr_option = weechat_config_search_option (
+                    alias_config_file,
+                    alias_config_section_completion,
+                    ptr_alias_name);
+                weechat_config_option_free (ptr_option);
+                update = 1;
+            }
+            else
+            {
+                weechat_printf (NULL,
+                                _("%sAlias \"%s\" already exists"),
+                                weechat_prefix ("error"),
+                                ptr_alias_name);
+                return WEECHAT_RC_OK;
+            }
+        }
+        alias_command_add (ptr_alias_name, argv_eol[3], NULL, update);
         return WEECHAT_RC_OK;
     }
 
-    if (weechat_strcmp (argv[1], "addcompletion") == 0)
+    if ((weechat_strcmp (argv[1], "addcompletion") == 0)
+        || (weechat_strcmp (argv[1], "addreplacecompletion") == 0))
     {
-        WEECHAT_COMMAND_MIN_ARGS(5, "addcompletion");
-        alias_command_add (
-            (weechat_string_is_command_char (argv[3])) ?
-            (char *)weechat_utf8_next_char (argv[3]) : argv[3],
-            argv_eol[4],
-            argv[2]);
+        WEECHAT_COMMAND_MIN_ARGS(5, argv[1]);
+        update = 0;
+        ptr_alias_name = (weechat_string_is_command_char (argv[3])) ?
+            (char *)weechat_utf8_next_char (argv[3]) : argv[3];
+        ptr_alias = alias_search (ptr_alias_name);
+        if (ptr_alias)
+        {
+            if (weechat_strcmp (argv[1], "addreplacecompletion") == 0)
+            {
+                alias_free (ptr_alias);
+                ptr_option = weechat_config_search_option (
+                    alias_config_file,
+                    alias_config_section_cmd,
+                    ptr_alias_name);
+                weechat_config_option_free (ptr_option);
+                ptr_option = weechat_config_search_option (
+                    alias_config_file,
+                    alias_config_section_completion,
+                    ptr_alias_name);
+                weechat_config_option_free (ptr_option);
+                update = 1;
+            }
+            else
+            {
+                weechat_printf (NULL,
+                                _("%sAlias \"%s\" already exists"),
+                                weechat_prefix ("error"),
+                                ptr_alias_name);
+                return WEECHAT_RC_OK;
+            }
+        }
+        alias_command_add (ptr_alias_name, argv_eol[4], argv[2], update);
         return WEECHAT_RC_OK;
     }
 
@@ -275,7 +331,8 @@ alias_command_cb (const void *pointer, void *data,
             {
                 alias_command_add (alias_default[i][0],  /* name */
                                    alias_default[i][1],  /* command */
-                                   alias_default[i][2]);  /* completion */
+                                   alias_default[i][2],  /* completion */
+                                   0);  /* update */
             }
         }
         return WEECHAT_RC_OK;
@@ -296,8 +353,9 @@ alias_command_init ()
         N_("list, add or remove command aliases"),
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated */
         N_("list [<name>]"
-           " || add <name> [<command>[;<command>...]]"
-           " || addcompletion <completion> <name> [<command>[;<command>...]]"
+           " || add|addreplace <name> [<command>[;<command>...]]"
+           " || addcompletion|addreplacecompletion <completion> <name> "
+           "[<command>[;<command>...]]"
            " || del <name>|<mask> [<name>|<mask>...]"
            " || rename <name> <new_name>"
            " || missing"),
@@ -306,17 +364,20 @@ alias_command_init ()
             N_("raw[list]: list aliases (without argument, this list is "
                "displayed)"),
             N_("raw[add]: add an alias"),
-            N_("name: name of alias"),
+            N_("raw[addreplace]: add or replace an existing alias"),
             N_("raw[addcompletion]: add an alias with a custom completion"),
-            N_("raw[del]: delete aliases"),
-            N_("mask: name where wildcard \"*\" is allowed"),
-            N_("raw[rename]: rename an alias"),
-            N_("raw[missing]: add missing aliases (using default aliases)"),
+            N_("raw[addreplacecompletion]: add or replace an existing alias "
+               "with a custom completion"),
+            N_("name: name of alias"),
             N_("completion: completion for alias: by default completion is "
                "done with target command (you can use \"%%command\" to use the "
                "completion of an existing command)"),
             N_("command: command name with arguments (many commands can be "
                "separated by semicolons)"),
+            N_("raw[del]: delete aliases"),
+            N_("mask: name where wildcard \"*\" is allowed"),
+            N_("raw[rename]: rename an alias"),
+            N_("raw[missing]: add missing aliases (using default aliases)"),
             "",
             N_("In command, special variables are replaced:"),
             N_("  $n: argument \"n\" (between 1 and 9)"),
@@ -336,8 +397,9 @@ alias_command_init ()
             AI("  /alias rename hello Hello"),
             AI("  /alias addcompletion %%sajoin forcejoin /quote forcejoin")),
         "list %(alias)"
-        " || add %(alias) %(commands:/)|%(alias_value)"
-        " || addcompletion %- %(alias) %(commands:/)|%(alias_value)"
+        " || add|addreplace %(alias) %(commands:/)|%(alias_value)"
+        " || addcompletion|addreplacecompletion %- %(alias) "
+        "%(commands:/)|%(alias_value)"
         " || del %(alias)|%*"
         " || rename %(alias) %(alias)"
         " || missing",