From 9b356733a9d0594e977e3a146b9a93b2f5afe848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Tue, 11 Jun 2024 08:03:09 +0200
Subject: [PATCH] core: allow buffer id in commands `/buffer` and `/print`, in
 addition to number and name

---
 CHANGELOG.md                       |  1 +
 po/cs.po                           | 39 +++++-------
 po/de.po                           | 82 +++++++++++---------------
 po/es.po                           | 39 +++++-------
 po/fr.po                           | 95 +++++++++++-------------------
 po/hu.po                           | 40 +++++--------
 po/it.po                           | 39 +++++-------
 po/ja.po                           | 45 +++++++-------
 po/pl.po                           | 64 +++++++++++---------
 po/pt.po                           | 40 +++++--------
 po/pt_BR.po                        | 35 +++++------
 po/ru.po                           | 40 +++++--------
 po/sr.po                           | 63 +++++++++++---------
 po/tr.po                           | 45 +++++++-------
 po/weechat.pot                     | 26 ++++----
 src/core/core-command.c            | 49 ++++++++-------
 src/gui/gui-buffer.c               | 12 ++--
 src/gui/gui-buffer.h               |  2 +-
 tests/unit/gui/test-gui-buffer.cpp | 45 ++++++++------
 19 files changed, 375 insertions(+), 426 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45b53466c..69b164a7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - core: add option `addreplace` in commands `/bar` and `/proxy` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - irc: add option `addreplace` in commands `/ignore`, `/notify` and `/server` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - relay: add option `addreplace` in commands `/relay` and `/remote` ([#2095](https://github.com/weechat/weechat/issues/2095))
+- core: allow buffer id in commands `/buffer` and `/print`, in addition to number and name
 - relay: enable websocket extension "permessage-deflate" with "api" relay only ([#1549](https://github.com/weechat/weechat/issues/1549))
 - api: allow NULL value for key in hashtable
 
diff --git a/po/cs.po b/po/cs.po
index 0aada393d..b8e025b69 100644
--- a/po/cs.po
+++ b/po/cs.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 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -1327,15 +1327,16 @@ msgstr "řídit buffery"
 #, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge "
 "[<číslo>] || close [<n1>[-<n2>]] || notify <úroveň> || localvar || set "
@@ -1463,6 +1464,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -2966,7 +2970,7 @@ msgstr "zobraz text v bufferu"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -16979,14 +16983,3 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "barva módů kanálu, blízko jména kanálu"
diff --git a/po/de.po b/po/de.po
index c57e8a92e..bb36f4a10 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-05-31 20:32+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de_DE\n"
@@ -1365,17 +1365,31 @@ msgid "manage buffers"
 msgstr "Buffer verwalten"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-"
+#| "all [<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
+#| "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || "
+#| "merge <number>|<name> || unmerge [<number>|-all] || hide [<number>|"
+#| "<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-all "
+#| "[<number>|<name>...]] || switch [-previous] || zoom || renumber "
+#| "[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>...] || "
+#| "notify [<level>] || listvar [<number>|<name>] || setvar <name> [<value>] "
+#| "|| delvar <name> || set <property> [<value>] || setauto <property> "
+#| "[<value>] || get <property> || jump smart|last_displayed|prev_visited|"
+#| "next_visited || <number>|-|+|<name>"
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
@@ -1539,6 +1553,11 @@ msgstr "> raw[prev_visited]: zuvor besuchter Buffer"
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr "> raw[next_visited]: zum nächsten besuchten Buffer springen"
 
+#, fuzzy
+#| msgid "raw[+]: jump to last buffer number"
+msgid "id: jump to buffer by id"
+msgstr "raw[+]: springt zum letzten Buffer"
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr "number: wechsel zu einem Buffer, mittels Nummer, mögliche Optionen:"
 
@@ -3330,8 +3349,13 @@ msgid "display text on a buffer"
 msgstr "gibt einen Text in einem Buffer aus"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+#| "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
+#| "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -18706,37 +18730,3 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
-
-#, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr ""
-#~ "%s%s: Remote-Relay \"%s\" existiert bereits und kann daher nicht angelegt "
-#~ "werden!"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr ""
-#~ "%s%s: Der Server \"%s\" existiert bereits und kann daher nicht angelegt "
-#~ "werden!"
-
-#~ msgid ""
-#~ "maximum length (in number of chars) of a raw message displayed (0 = "
-#~ "display whole message); the beginning and end of message is always "
-#~ "displayed with at the middle: \" (...) \"; for example if the value is 8 "
-#~ "and the raw message is \"abcdefghijklmnopqrstuvwxyz\", then the raw "
-#~ "message displayed is: \"abcd (...) wxyz\""
-#~ msgstr ""
-#~ "Maximale Länge (in Zeichen) einer angezeigten Rohnachricht (0 = ganze "
-#~ "Nachricht anzeigen); Anfang und Ende einer Nachricht wird immer "
-#~ "angezeigt, der Mittelteil wird als \" (...) \" angezeigt; Beispiel: wenn "
-#~ "der Wert 8 ist und die Rohnachricht \"abcdefghijklmnopqrstuvwxyz\" "
-#~ "lautet, dann sieht die angezeigte Rohnachricht wie folgt aus: \"abcd "
-#~ "(...) wxyz\""
-
-#~ msgid "option: set option for remote relay: proxy, password or totp_secret"
-#~ msgstr ""
-#~ "option: Option für Remote-Relay festlegen: Proxy, Passwort oder "
-#~ "totp_secret"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "Farbe der Kanal-Modes (neben des Kanalnamens)"
diff --git a/po/es.po b/po/es.po
index 1759c4297..59997bb20 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: es\n"
@@ -1397,15 +1397,16 @@ msgstr "gestionar los buffers"
 #, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <nombre> || clear [<número>|<nombre>|-merged|-"
 "all [<número>|<nombre>...]] || move <número>|-|+ || swap <número1>|<nombre1> "
@@ -1542,6 +1543,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -3074,7 +3078,7 @@ msgstr "color del texto en el buffer"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -17288,14 +17292,3 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse: error (%d)"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: el servidor \"%s\" ya existe, ¡no se puede crear!"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: el servidor \"%s\" ya existe, ¡no se puede crear!"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "color para los modos del canal, junto al nombre del canal"
diff --git a/po/fr.po b/po/fr.po
index 09b84aeee..a4b0377ce 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 23:15+0200\n"
-"PO-Revision-Date: 2024-06-09 23:16+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:59+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1337,26 +1337,28 @@ msgstr "gestion des tampons"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
-"list || add [-free] [-switch] <nom> || clear [<nombre>|<nom>|-merged|-all "
-"[<nombre>|<nom>...]] || move <nombre>|-|+ || swap <nombre1>|<nom1> "
-"[<nombre2>|<nom2>] || cycle <nombre>|<nom> [<nombre>|<nom>...] || merge "
-"<nombre>|<nom> || unmerge [<nombre>|-all] || hide [<nombre>|<nom>|-all "
-"[<nombre>|<nom>...]] || unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]] || "
-"switch [-previous] || zoom || renumber <nombre1> [<nombre2> [<départ>]] || "
-"close [<n1>[-<n2>]|<nom>...] || notify [<niveau>] || listvar [<nombre>|"
-"<nom>] || setvar <nom> [<valeur>] || delvar <nom> || set <propriété> "
-"[<valeur>] || setauto <propriété> [<valeur>] || get <propriété> || jump "
-"smart|last_displayed|prev_visited|next_visited || <nombre>|-|+|<nom>"
+"list || add [-free] [-switch] <nom> || clear [<id>|<numéro>|<nom>|-merged|-"
+"all [<id>|<numéro>|<nom>...]] || move <numéro>|-|+ || swap <id1>|<numéro1>|"
+"<nom1> [<id2>|<numéro2>|<nom2>] || cycle <id>|<numéro>|<nom> [<id>|<numéro>|"
+"<nom>...] || merge <id>|<numéro>|<nom> || unmerge [<id>|<numéro>|-all] || "
+"hide [<id>|<numéro>|<nom>|-all [<id>|<numéro>|<nom>...]] || unhide [<id>|"
+"<numéro>|<nom>|-all [<id>|<numéro>|<nom>...]] || switch [-previous] || zoom "
+"|| renumber <numéro1> [<numéro2> [<départ>]] || close [<n1>[-<n2>]|<nom>...] "
+"|| notify [<niveau>] || listvar [<id>|<numéro>|<nom>] || setvar <nom> "
+"[<valeur>] || delvar <nom> || set <propriété> [<valeur>] || setauto "
+"<propriété> [<valeur>] || get <propriété> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<numéro>|-|+|<nom>"
 
 msgid "raw[list]: list buffers (without argument, this list is displayed)"
 msgstr ""
@@ -1434,7 +1436,7 @@ msgstr ""
 
 msgid "raw[close]: close buffer (number/range or name is optional)"
 msgstr ""
-"raw[close] : fermer le tampon (le nombre/intervalle ou nom est optionnel)"
+"raw[close] : fermer le tampon (le numéro/intervalle ou nom est optionnel)"
 
 msgid ""
 "raw[notify]: display or set notify level for current buffer: this level "
@@ -1501,8 +1503,11 @@ msgstr "> raw[prev_visited] : tampon visité précédemment"
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr "> raw[next_visited] : tampon visité après"
 
+msgid "id: jump to buffer by id"
+msgstr "id : sauter au tampon qui a cet identifiant"
+
 msgid "number: jump to buffer by number, possible prefix:"
-msgstr "nombre : sauter au tampon qui a ce numéro, préfixe possible :"
+msgstr "numéro : sauter au tampon qui a ce numéro, préfixe possible :"
 
 msgid "> \"+\": relative jump, add number to current"
 msgstr "> \"+\" : saut relatif, ajoute le numéro au courant"
@@ -3259,11 +3264,11 @@ msgstr "afficher du texte dans un tampon"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
-"[-buffer <numéro>|<nom>] [-newbuffer <nom>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<numéro>|<nom>] [-newbuffer <nom>] [-free] [-switch] [-core|-"
 "current] [-y <ligne>] [-escape] [-date <date>] [-tags <étiquettes>] [-"
 "action|-error|-join|-network|-quit] [<texte>] || -stdout|-stderr [<texte>] "
 "|| -beep"
@@ -8214,7 +8219,7 @@ msgstr ""
 "default_options."
 
 msgid "ids (numbers and names) of executed commands"
-msgstr "ids (nombres et noms) des commandes exécutées"
+msgstr "ids (numéros et noms) des commandes exécutées"
 
 msgid ""
 "default options for command /exec (see /help exec); example: \"-nosh -bg\" "
@@ -9114,7 +9119,7 @@ msgid "color for filter in title of buffer"
 msgstr "couleur pour le filtre dans le titre du tampon"
 
 msgid "color for number of marked options in title of buffer"
-msgstr "couleur pour le nombre d'option marquées dans le titre du tampon"
+msgstr "couleur pour le nombre d'options marquées dans le titre du tampon"
 
 msgid "color for sort in title of buffer"
 msgstr "couleur pour le tri dans le titre du tampon"
@@ -11045,10 +11050,10 @@ msgstr "supprimer le bannissement sur des pseudos ou hôtes"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid "[<channel>] <nick>|<number>|<n1>-<n2> [<nick>|<number>|<n1>-<n2>...]"
-msgstr "[<canal>] <pseudo>|<nombre>|<n1>-<n2> [<pseudo>|<nombre>|<n1>-<n2>...]"
+msgstr "[<canal>] <pseudo>|<numéro>|<n1>-<n2> [<pseudo>|<numéro>|<n1>-<n2>...]"
 
 msgid "number: ban number (as displayed by command /ban)"
-msgstr "nombre : numéro de bannissement (tel qu'affiché par la commande /ban)"
+msgstr "numéro : numéro de bannissement (tel qu'affiché par la commande /ban)"
 
 msgid "n1: interval start number"
 msgstr "n1 : numéro de départ de l'intervalle"
@@ -11060,7 +11065,7 @@ msgid "unquiet nicks or hosts"
 msgstr "ne plus taire des pseudos ou hôtes"
 
 msgid "number: quiet number (as displayed by command /quiet)"
-msgstr "nombre : numéro de \"quiet\" (tel qu'affiché par la commande /quiet)"
+msgstr "numéro : numéro de \"quiet\" (tel qu'affiché par la commande /quiet)"
 
 msgid "return a list of information about nicks"
 msgstr "retourner une liste d'informations sur des pseudos"
@@ -18241,33 +18246,3 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
-
-#, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr ""
-#~ "%s%s : le relai distant \"%s\" existe déjà, impossible de l'ajouter !"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s : le serveur \"%s\" existe déjà, impossible de l'ajouter !"
-
-#~ msgid ""
-#~ "maximum length (in number of chars) of a raw message displayed (0 = "
-#~ "display whole message); the beginning and end of message is always "
-#~ "displayed with at the middle: \" (...) \"; for example if the value is 8 "
-#~ "and the raw message is \"abcdefghijklmnopqrstuvwxyz\", then the raw "
-#~ "message displayed is: \"abcd (...) wxyz\""
-#~ msgstr ""
-#~ "longueur maximale (en nombre de caractères) d'un message brut affiché (0 "
-#~ "= afficher le message entier) ; le début et la fin du message est "
-#~ "toujours affichée avec au milieu  : \" (...) \" ; par exemple si la "
-#~ "valeur est 8 et le message brut est \"abcdefghijklmnopqrstuvwxyz\", alors "
-#~ "le message affiché est : \"abcd (...) wxyz\""
-
-#~ msgid "option: set option for remote relay: proxy, password or totp_secret"
-#~ msgstr ""
-#~ "option : définir une option pour le relai distant : proxy, password ou "
-#~ "totp_secret"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "couleur pour les modes du canal, à côté du nom du canal"
diff --git a/po/hu.po b/po/hu.po
index bc5945e5f..b16ef1439 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: hu\n"
@@ -1276,15 +1276,16 @@ msgstr "pufferek kezelése"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 
 msgid "raw[list]: list buffers (without argument, this list is displayed)"
@@ -1403,6 +1404,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -2858,7 +2862,7 @@ msgstr "szerver nevének színe"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -16250,15 +16254,3 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
-
-#, fuzzy
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "szobanevek színe az eseményekben"
diff --git a/po/it.po b/po/it.po
index a0f87fb91..06c71a557 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: it\n"
@@ -1301,15 +1301,16 @@ msgstr "gestione dei buffer"
 #, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || clear [<numero>|<nome>|-merged|-all] || move|merge <numero> || swap "
 "<numero1>|<nome1> [<numero2>|<nome2>] || unmerge [<numero>|-all] || close "
@@ -1435,6 +1436,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -2965,7 +2969,7 @@ msgstr "colore del testo nei buffer relay"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -17353,14 +17357,3 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "colore per le modalità dei canali, vicino ai nomi dei canali"
diff --git a/po/ja.po b/po/ja.po
index a1dc9f0cd..0e15afd94 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
 "translation/ja_JP>\n"
@@ -1355,15 +1355,16 @@ msgstr "バッファの管理"
 #, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
@@ -1496,6 +1497,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -3045,8 +3049,13 @@ msgid "display text on a buffer"
 msgstr "バッファ内にテキストを表示"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+#| "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
+#| "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -17867,15 +17876,3 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
-
-#, fuzzy, c-format
-#~| msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: サーバ \"%s\" は既に存在しており、追加できません"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: サーバ \"%s\" は既に存在しており、追加できません"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "チャンネル名付近のチャンネルモードに使う色"
diff --git a/po/pl.po b/po/pl.po
index 63d73c05e..5513e2832 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-06-09 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pl\n"
@@ -1327,17 +1327,31 @@ msgid "manage buffers"
 msgstr "zarządzaj buforami"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-"
+#| "all [<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
+#| "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || "
+#| "merge <number>|<name> || unmerge [<number>|-all] || hide [<number>|"
+#| "<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-all "
+#| "[<number>|<name>...]] || switch [-previous] || zoom || renumber "
+#| "[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>...] || "
+#| "notify [<level>] || listvar [<number>|<name>] || setvar <name> [<value>] "
+#| "|| delvar <name> || set <property> [<value>] || setauto <property> "
+#| "[<value>] || get <property> || jump smart|last_displayed|prev_visited|"
+#| "next_visited || <number>|-|+|<name>"
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <nazwa> || clear [<numer>|<nazwa>|-merged|-all "
 "[<numer>|<nazwa>...]] || move <numer>|-|+ || swap <numer1>|<nazwa1> "
@@ -1486,6 +1500,11 @@ msgstr "> raw[prev_visited]: poprzednio odwiedzony bufor"
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr "> raw[next_visited]: przejdź do następnego odwiedzonego bufora"
 
+#, fuzzy
+#| msgid "raw[+]: jump to last buffer number"
+msgid "id: jump to buffer by id"
+msgstr "raw[+]: skocz do ostatniego numeru bufora"
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr "numer: przeskocz do bufora według numeru, możliwe przedrostki:"
 
@@ -3175,8 +3194,13 @@ msgid "display text on a buffer"
 msgstr "wyświetl tekst w buforze"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+#| "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
+#| "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -17796,19 +17820,3 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
-
-#, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: zdalny pośrednik „%s” już istnieje, nie mogę go dodać!"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: serwer \"%s\" już istnieje, nie mogę go dodać!"
-
-#~ msgid "option: set option for remote relay: proxy, password or totp_secret"
-#~ msgstr ""
-#~ "opcja: ustaw opcję dla zdalnego pośrednika: proxy, password lub "
-#~ "totp_secret"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "kolor trybów kanału, przy nazwie kanału"
diff --git a/po/pt.po b/po/pt.po
index 67270e6ed..1af06ec92 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -1347,15 +1347,16 @@ msgstr "gerir buffers"
 #, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nome>|-merged|-all [<número>|<nome>...]] || move "
 "<número>|-|+ || swap <número1>|<nome1> [<número2>|<nome2>] || cycle <número>|"
@@ -1487,6 +1488,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -3044,7 +3048,7 @@ msgstr "mostrar texto num buffer"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -17793,15 +17797,3 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
-
-#, fuzzy, c-format
-#~| msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: o servidor \"%s\" já existe, não é possível adicioná-lo!"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: o servidor \"%s\" já existe, não é possível adicioná-lo!"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "cor dos modos do canal, junto ao nome do canal"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ebadaf8a6..68da3d0e3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pt_BR\n"
@@ -1339,15 +1339,16 @@ msgstr "gerenciar buffers"
 #, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || swap "
 "<número1>|<nome1> [<número2>|<nome2>] || unmerge [<número>|-all] || close "
@@ -1473,6 +1474,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -3006,7 +3010,7 @@ msgstr "cor do texto para nomes de buffer"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -16793,10 +16797,3 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%sErro: filtro \"%s\" já existe"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "cor para os modos de canal, próximo ao nome do canal"
diff --git a/po/ru.po b/po/ru.po
index b2409e354..ecca316ee 100644
--- a/po/ru.po
+++ b/po/ru.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 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: ru\n"
@@ -1299,15 +1299,16 @@ msgstr "управление буферами"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 
 msgid "raw[list]: list buffers (without argument, this list is displayed)"
@@ -1426,6 +1427,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -2883,7 +2887,7 @@ msgstr "цвет названия сервера"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -16300,15 +16304,3 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n"
-
-#, fuzzy, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n"
-
-#, fuzzy
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "цвет имён при действиях"
diff --git a/po/sr.po b/po/sr.po
index 6ad77dc03..29310492a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-05-07 14:00+0400\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: sr\n"
@@ -1331,17 +1331,31 @@ msgid "manage buffers"
 msgstr "управљање баферима"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-"
+#| "all [<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
+#| "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || "
+#| "merge <number>|<name> || unmerge [<number>|-all] || hide [<number>|"
+#| "<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-all "
+#| "[<number>|<name>...]] || switch [-previous] || zoom || renumber "
+#| "[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>...] || "
+#| "notify [<level>] || listvar [<number>|<name>] || setvar <name> [<value>] "
+#| "|| delvar <name> || set <property> [<value>] || setauto <property> "
+#| "[<value>] || get <property> || jump smart|last_displayed|prev_visited|"
+#| "next_visited || <number>|-|+|<name>"
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <име> || clear [<број>|<име>|-merged|-all "
 "[<број>|<име>...]] || move <број>|-|+ || swap <број1>|<име1> [<број2>|"
@@ -1489,6 +1503,11 @@ msgstr "> raw[prev_visited]: претходно посећени бафер"
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr "> raw[next_visited]: скок на наредни посећени бафер"
 
+#, fuzzy
+#| msgid "raw[+]: jump to last buffer number"
+msgid "id: jump to buffer by id"
+msgstr "raw[+]: скок на последњи број бафера"
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr "број: скок на бафер са бројем, могући префикси:"
 
@@ -3173,8 +3192,13 @@ msgid "display text on a buffer"
 msgstr "исписује текст у бафер"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+#| "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
+#| "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -17818,18 +17842,3 @@ msgstr "%s%s: тајмаут за „%s” са %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)"
-
-#, c-format
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: релеј удаљених „%s” већ постоји, не може да се дода!"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: сервер „%s” већ постоји, не може да се дода!"
-
-#~ msgid "option: set option for remote relay: proxy, password or totp_secret"
-#~ msgstr ""
-#~ "опција: постављање опције релеја удаљених: proxy, password или totp_secret"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "боја за режиме канала, у близини имена канала"
diff --git a/po/tr.po b/po/tr.po
index 7825642d3..6caf3d2be 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 23:15+0200\n"
-"PO-Revision-Date: 2024-04-07 14:50+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+0200\n"
+"PO-Revision-Date: 2024-06-11 07:49+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: tr\n"
@@ -1376,15 +1376,16 @@ msgstr "arabellekleri yönet"
 #| "smart|last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <ad> || clear [<sayı>|<ad>|-merged|-all "
 "[<sayı>|<ad>...]] || move <sayı>|-|+ || swap <sayı1>|<ad1> [<sayı2>|<ad2>] "
@@ -1521,6 +1522,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -3083,8 +3087,13 @@ msgid "display text on a buffer"
 msgstr "metni bir arabellekte görüntüle"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+#| "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
+#| "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
@@ -18123,15 +18132,3 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)"
-
-#, fuzzy, c-format
-#~| msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgid "%s%s: remote relay \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: \"%s\" sunucusu halihazırda mevcut, eklenemiyor!"
-
-#, c-format
-#~ msgid "%s%s: server \"%s\" already exists, can't add it!"
-#~ msgstr "%s%s: \"%s\" sunucusu halihazırda mevcut, eklenemiyor!"
-
-#~ msgid "color for channel modes, near channel name"
-#~ msgstr "kanal kipleri, kanal adı yanı renkler"
diff --git a/po/weechat.pot b/po/weechat.pot
index 449bdcc0f..15cd2dec7 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 23:15+0200\n"
+"POT-Creation-Date: 2024-06-11 07:59+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"
@@ -1184,15 +1184,16 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
-"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
-"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
-"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
-"|| switch [-previous] || zoom || renumber [<number1> [<number2> [<start>]]] "
-"|| close [<n1>[-<n2>]|<name>...] || notify [<level>] || listvar [<number>|"
-"<name>] || setvar <name> [<value>] || delvar <name> || set <property> "
-"[<value>] || setauto <property> [<value>] || get <property> || jump smart|"
-"last_displayed|prev_visited|next_visited || <number>|-|+|<name>"
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name> [<id>|"
+"<number>|<name>...] || merge <id>|<number>|<name> || unmerge [<number>|-all] "
+"|| hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || unhide "
+"[<id>|<number>|<name>|-all [<id>|<number>|<name>...]] || switch [-previous] "
+"|| zoom || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
+"<name>...] || notify [<level>] || listvar [<id>|<number>|<name>] || setvar "
+"<name> [<value>] || delvar <name> || set <property> [<value>] || setauto "
+"<property> [<value>] || get <property> || jump smart|last_displayed|"
+"prev_visited|next_visited || <id>|<number>|-|+|<name>"
 msgstr ""
 
 msgid "raw[list]: list buffers (without argument, this list is displayed)"
@@ -1308,6 +1309,9 @@ msgstr ""
 msgid "> raw[next_visited]: jump to next visited buffer"
 msgstr ""
 
+msgid "id: jump to buffer by id"
+msgstr ""
+
 msgid "number: jump to buffer by number, possible prefix:"
 msgstr ""
 
@@ -2685,7 +2689,7 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
+"[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] [-core|-"
 "current] [-y <line>] [-escape] [-date <date>] [-tags <tags>] [-action|-"
 "error|-join|-network|-quit] [<text>] || -stdout|-stderr [<text>] || -beep"
 msgstr ""
diff --git a/src/core/core-command.c b/src/core/core-command.c
index 3ec208b68..f9d60387c 100644
--- a/src/core/core-command.c
+++ b/src/core/core-command.c
@@ -661,6 +661,7 @@ COMMAND_CALLBACK(buffer)
     struct t_gui_buffer *weechat_buffer;
     struct t_arraylist *buffers_to_close;
     long number, number1, number2, numbers[3];
+    long long number_id;
     char *error, *value, *pos, *str_number1, *pos_number2;
     int i, count, prev_number, clear_number, list_size;
     int buffer_found, arg_name, type_free, switch_to_buffer, rc;
@@ -756,7 +757,7 @@ COMMAND_CALLBACK(buffer)
                     }
                     else
                     {
-                        ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+                        ptr_buffer = gui_buffer_search_by_id_number_name (argv[i]);
                         error = NULL;
                         (void) strtol (argv[i], &error, 10);
                         clear_number = (error && !error[0]);
@@ -847,7 +848,7 @@ COMMAND_CALLBACK(buffer)
         ptr_buffer2 = NULL;
 
         /* search buffers to swap */
-        ptr_buffer = gui_buffer_search_by_number_or_name (argv[2]);
+        ptr_buffer = gui_buffer_search_by_id_number_name (argv[2]);
         if (!ptr_buffer)
         {
             /* invalid buffer name/number */
@@ -859,7 +860,7 @@ COMMAND_CALLBACK(buffer)
         }
         if (argc > 3)
         {
-            ptr_buffer2 = gui_buffer_search_by_number_or_name (argv[3]);
+            ptr_buffer2 = gui_buffer_search_by_id_number_name (argv[3]);
             if (!ptr_buffer2)
             {
                 /* invalid buffer name/number */
@@ -893,7 +894,7 @@ COMMAND_CALLBACK(buffer)
 
         for (i = 2; i < argc; i++)
         {
-            ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+            ptr_buffer = gui_buffer_search_by_id_number_name (argv[i]);
             if (!ptr_buffer)
                 continue;
             if (ptr_buffer == buffer)
@@ -933,7 +934,7 @@ COMMAND_CALLBACK(buffer)
     {
         COMMAND_MIN_ARGS(3, argv[1]);
         error = NULL;
-        ptr_buffer = gui_buffer_search_by_number_or_name (argv[2]);
+        ptr_buffer = gui_buffer_search_by_id_number_name (argv[2]);
         if (!ptr_buffer)
         {
             gui_chat_printf (NULL,
@@ -990,7 +991,7 @@ COMMAND_CALLBACK(buffer)
             {
                 for (i = 2; i < argc; i++)
                 {
-                    ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+                    ptr_buffer = gui_buffer_search_by_id_number_name (argv[i]);
                     if (ptr_buffer)
                     {
                         error = NULL;
@@ -1029,7 +1030,7 @@ COMMAND_CALLBACK(buffer)
             {
                 for (i = 2; i < argc; i++)
                 {
-                    ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+                    ptr_buffer = gui_buffer_search_by_id_number_name (argv[i]);
                     if (ptr_buffer)
                     {
                         error = NULL;
@@ -1275,7 +1276,7 @@ COMMAND_CALLBACK(buffer)
         || (string_strcmp (argv[1], "localvar") == 0))
     {
         if (argc > 2)
-            ptr_buffer = gui_buffer_search_by_number_or_name (argv[2]);
+            ptr_buffer = gui_buffer_search_by_id_number_name (argv[2]);
         else
             ptr_buffer = buffer;
 
@@ -1608,13 +1609,16 @@ COMMAND_CALLBACK(buffer)
         return WEECHAT_RC_OK;
     }
 
-    /* jump to buffer by number or name */
+    /* jump to buffer by id, number or name */
     error = NULL;
-    number = strtol (argv[1], &error, 10);
+    number_id = strtoll (argv[1], &error, 10);
     if (error && !error[0])
     {
-        gui_buffer_switch_by_number (gui_current_window,
-                                     (int) number);
+        ptr_buffer = gui_buffer_search_by_id (number_id);
+        if (ptr_buffer)
+            gui_window_switch_to_buffer (gui_current_window, ptr_buffer, 1);
+        else
+            gui_buffer_switch_by_number (gui_current_window, (int) number_id);
         return WEECHAT_RC_OK;
     }
     else
@@ -5262,7 +5266,7 @@ COMMAND_CALLBACK(print)
             if (i + 1 >= argc)
                 COMMAND_ERROR;
             i++;
-            ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+            ptr_buffer = gui_buffer_search_by_id_number_name (argv[i]);
             if (!ptr_buffer)
                 COMMAND_ERROR;
         }
@@ -8081,27 +8085,27 @@ command_init ()
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated */
         N_("list"
            " || add [-free] [-switch] <name>"
-           " || clear [<number>|<name>|-merged|-all [<number>|<name>...]]"
+           " || clear [<number>|<name>|-merged|-all [<id>|<number>|<name>...]]"
            " || move <number>|-|+"
-           " || swap <number1>|<name1> [<number2>|<name2>]"
-           " || cycle <number>|<name> [<number>|<name>...]"
-           " || merge <number>|<name>"
+           " || swap <id1>|<number1>|<name1> [<id2>|<number2>|<name2>]"
+           " || cycle <id>|<number>|<name> [<id>|<number>|<name>...]"
+           " || merge <id>|<number>|<name>"
            " || unmerge [<number>|-all]"
-           " || hide [<number>|<name>|-all [<number>|<name>...]]"
-           " || unhide [<number>|<name>|-all [<number>|<name>...]]"
+           " || hide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]]"
+           " || unhide [<id>|<number>|<name>|-all [<id>|<number>|<name>...]]"
            " || switch [-previous]"
            " || zoom"
            " || renumber [<number1> [<number2> [<start>]]]"
            " || close [<n1>[-<n2>]|<name>...]"
            " || notify [<level>]"
-           " || listvar [<number>|<name>]"
+           " || listvar [<id>|<number>|<name>]"
            " || setvar <name> [<value>]"
            " || delvar <name>"
            " || set <property> [<value>]"
            " || setauto <property> [<value>]"
            " || get <property>"
            " || jump smart|last_displayed|prev_visited|next_visited"
-           " || <number>|-|+|<name>"),
+           " || <id>|<number>|-|+|<name>"),
         CMD_ARGS_DESC(
             N_("raw[list]: list buffers (without argument, this list is displayed)"),
             N_("raw[add]: add a new buffer (it can be closed with \"/buffer close\" "
@@ -8147,6 +8151,7 @@ command_init ()
                "to a buffer)"),
             N_("> raw[prev_visited]: previously visited buffer"),
             N_("> raw[next_visited]: jump to next visited buffer"),
+            N_("id: jump to buffer by id"),
             N_("number: jump to buffer by number, possible prefix:"),
             N_("> \"+\": relative jump, add number to current"),
             N_("> \"-\": relative jump, sub number to current"),
@@ -9079,7 +9084,7 @@ command_init ()
         NULL, "print",
         N_("display text on a buffer"),
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated */
-        N_("[-buffer <number>|<name>] [-newbuffer <name>] [-free] [-switch] "
+        N_("[-buffer <id>|<number>|<name>] [-newbuffer <name>] [-free] [-switch] "
            "[-core|-current] [-y <line>] [-escape] [-date <date>] "
            "[-tags <tags>] [-action|-error|-join|-network|-quit] [<text>]"
            " || -stdout|-stderr [<text>]"
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index fd8831eb7..a9791df7d 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -3251,14 +3251,14 @@ gui_buffer_search_by_number (int number)
 }
 
 /*
- * Searches for a buffer by number, full name or partial name.
+ * Searches for a buffer by id, number, full name or partial name.
  */
 
 struct t_gui_buffer *
-gui_buffer_search_by_number_or_name (const char *string)
+gui_buffer_search_by_id_number_name (const char *string)
 {
     struct t_gui_buffer *ptr_buffer;
-    long number;
+    long long number;
     char *error;
 
     if (!string)
@@ -3267,10 +3267,12 @@ gui_buffer_search_by_number_or_name (const char *string)
     ptr_buffer = NULL;
 
     error = NULL;
-    number = strtol (string, &error, 10);
+    number = strtoll (string, &error, 10);
     if (error && !error[0])
     {
-        ptr_buffer = gui_buffer_search_by_number (number);
+        ptr_buffer = gui_buffer_search_by_id (number);
+        if (!ptr_buffer)
+            ptr_buffer = gui_buffer_search_by_number (number);
     }
     else
     {
diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h
index 8aea520ac..6ce9f854d 100644
--- a/src/gui/gui-buffer.h
+++ b/src/gui/gui-buffer.h
@@ -407,7 +407,7 @@ extern struct t_gui_buffer *gui_buffer_search (const char *plugin, const char *n
 extern struct t_gui_buffer *gui_buffer_search_by_partial_name (const char *plugin,
                                                                const char *name);
 extern struct t_gui_buffer *gui_buffer_search_by_number (int number);
-extern struct t_gui_buffer *gui_buffer_search_by_number_or_name (const char *string);
+extern struct t_gui_buffer *gui_buffer_search_by_id_number_name (const char *string);
 extern int gui_buffer_count_merged_buffers (int number);
 extern void gui_buffer_clear (struct t_gui_buffer *buffer);
 extern void gui_buffer_clear_all ();
diff --git a/tests/unit/gui/test-gui-buffer.cpp b/tests/unit/gui/test-gui-buffer.cpp
index 13c9989ec..1e3d4d16a 100644
--- a/tests/unit/gui/test-gui-buffer.cpp
+++ b/tests/unit/gui/test-gui-buffer.cpp
@@ -1571,37 +1571,46 @@ TEST(GuiBuffer, SearchByNumber)
 
 /*
  * Tests functions:
- *   gui_buffer_search_by_number_or_name
+ *   gui_buffer_search_by_id_number_name
  */
 
-TEST(GuiBuffer, SearchByNumberOrName)
+TEST(GuiBuffer, SearchByIdNumberName)
 {
     struct t_gui_buffer *buffer;
+    char str_id[64];
 
     buffer = gui_buffer_new (NULL, TEST_BUFFER_NAME,
                              NULL, NULL, NULL,
                              NULL, NULL, NULL);
     CHECK(buffer);
 
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name (NULL));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name (""));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name ("xxx"));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name ("-1"));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name ("0"));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name ("3"));
+    /* buffer not found */
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name (NULL));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name (""));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name ("xxx"));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name ("-1"));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name ("0"));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name ("3"));
 
-    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_number_or_name ("1"));
-    POINTERS_EQUAL(buffer, gui_buffer_search_by_number_or_name ("2"));
+    /* search by id */
+    snprintf (str_id, sizeof (str_id), "%lld", gui_buffers->id);
+    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_id_number_name (str_id));
+    snprintf (str_id, sizeof (str_id), "%lld", buffer->id);
+    POINTERS_EQUAL(buffer, gui_buffer_search_by_id_number_name (str_id));
 
-    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_number_or_name ("weechat"));
-    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_number_or_name ("core.weechat"));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name ("CORE.WEECHAT"));
-    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_number_or_name ("(?i)CORE.WEECHAT"));
+    /* search by number */
+    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_id_number_name ("1"));
+    POINTERS_EQUAL(buffer, gui_buffer_search_by_id_number_name ("2"));
 
-    POINTERS_EQUAL(buffer, gui_buffer_search_by_number_or_name (TEST_BUFFER_NAME));
-    POINTERS_EQUAL(buffer, gui_buffer_search_by_number_or_name ("core." TEST_BUFFER_NAME));
-    POINTERS_EQUAL(NULL, gui_buffer_search_by_number_or_name ("CORE." TEST_BUFFER_NAME));
-    POINTERS_EQUAL(buffer, gui_buffer_search_by_number_or_name ("(?i)CORE." TEST_BUFFER_NAME));
+    /* search by name */
+    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_id_number_name ("weechat"));
+    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_id_number_name ("core.weechat"));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name ("CORE.WEECHAT"));
+    POINTERS_EQUAL(gui_buffers, gui_buffer_search_by_id_number_name ("(?i)CORE.WEECHAT"));
+    POINTERS_EQUAL(buffer, gui_buffer_search_by_id_number_name (TEST_BUFFER_NAME));
+    POINTERS_EQUAL(buffer, gui_buffer_search_by_id_number_name ("core." TEST_BUFFER_NAME));
+    POINTERS_EQUAL(NULL, gui_buffer_search_by_id_number_name ("CORE." TEST_BUFFER_NAME));
+    POINTERS_EQUAL(buffer, gui_buffer_search_by_id_number_name ("(?i)CORE." TEST_BUFFER_NAME));
 
     gui_buffer_close (buffer);
 }