irc: fix help on `sort` option in command `/autojoin` (issue #1876)

15 files changed, 76 insertions, 47 deletions

diff --git a/po/cs.po b/po/cs.po
index e0697aa84..4620190ae 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7259,8 +7259,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/de.po b/po/de.po
index 2ee0e9784..e9f622b1c 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-05-01 17:32+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German - Germany <weechatter@arcor.de>\n"
@@ -9100,6 +9100,34 @@ msgstr ""
 "[<key1>[,<key2>...]] || del [<channel1> [<channel2>...]] || apply || join || "
 "sort [buffer]"
 
+#, fuzzy
+#| msgid ""
+#| "    add: add current channel or a list of channels (with optional keys) "
+#| "to the autojoin option; if you are on the channel and the key is not "
+#| "provided, the key is read in the channel\n"
+#| " addraw: use the IRC raw format (same as /join command): all channels "
+#| "separated by commas, optional keys separated by commas\n"
+#| "    del: delete current channel or a list of channels from the autojoin "
+#| "option\n"
+#| "channel: channel name\n"
+#| "    key: key for the channel\n"
+#| "  apply: set currently joined channels in the autojoin option\n"
+#| "   join: join the channels in the autojoin option\n"
+#| "   sort: sort alphabetically channels in the autojoin option\n"
+#| " buffer: sort channels by order of buffers in the autojoin option\n"
+#| "\n"
+#| "Examples:\n"
+#| "  /autojoin add\n"
+#| "  /autojoin add #test\n"
+#| "  /autojoin add #chan1 #chan2\n"
+#| "  /allchan /autojoin add\n"
+#| "  /autojoin addraw #chan1,#chan2,#chan3 key1,key2\n"
+#| "  /autojoin del\n"
+#| "  /autojoin del #chan1\n"
+#| "  /autojoin apply\n"
+#| "  /autojoin join\n"
+#| "  /autojoin sort\n"
+#| "  /autojoin sort buffer"
 msgid ""
 "    add: add current channel or a list of channels (with optional keys) to "
 "the autojoin option; if you are on the channel and the key is not provided, "
@@ -9112,8 +9140,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/es.po b/po/es.po
index 636dbbdf3..7145a179a 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7897,8 +7897,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/fr.po b/po/fr.po
index 1526f2fc5..17516073c 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: 2023-05-01 16:57+0200\n"
-"PO-Revision-Date: 2023-05-01 17:02+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
+"PO-Revision-Date: 2023-05-01 17:49+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -8942,8 +8942,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
@@ -8970,8 +8970,9 @@ msgstr ""
 "    key : clé pour le canal\n"
 "  apply : définir les canaux actuellement joints dans l'option autojoin\n"
 "   join : joindre les canaux de l'option autojoin\n"
-"   sort : trier les canaux de l'option autojoin par ordre alphabétique\n"
-" buffer : trier les canaux de l'option autojoin par ordre des tampons\n"
+"   sort : trier les canaux de l'option autojoin par ordre alphabétique ; "
+"avec \"buffer\" : trier d'abord par numéro de tampon, puis par ordre "
+"alphabétique\n"
 "\n"
 "Exemples :\n"
 "  /autojoin add\n"
diff --git a/po/hu.po b/po/hu.po
index 0880a8c2d..cf0a854a7 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6712,8 +6712,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/it.po b/po/it.po
index b7029443a..9752fef6f 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7597,8 +7597,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/ja.po b/po/ja.po
index e62f9b355..5b1372804 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -8615,8 +8615,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/pl.po b/po/pl.po
index 4fb35fcdd..8c03747fc 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-04-13 20:09+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -9415,8 +9415,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/pt.po b/po/pt.po
index cb23d045f..e11644c37 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -8363,8 +8363,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0817cc570..0ae77cb65 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7441,8 +7441,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/ru.po b/po/ru.po
index 330a799cb..e46bfa577 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-03-25 21:13+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6754,8 +6754,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/sr.po b/po/sr.po
index 545f03168..63444f54a 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-04-13 20:10+0200\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9155,8 +9155,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/tr.po b/po/tr.po
index e4ccd9cf4..072b3d1c7 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+0200\n"
 "PO-Revision-Date: 2023-04-23 16:51+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9007,8 +9007,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index cd32bf577..3772e1eda 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: 2023-05-01 16:57+0200\n"
+"POT-Creation-Date: 2023-05-01 17:48+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"
@@ -6199,8 +6199,8 @@ msgid ""
 "    key: key for the channel\n"
 "  apply: set currently joined channels in the autojoin option\n"
 "   join: join the channels in the autojoin option\n"
-"   sort: sort alphabetically channels in the autojoin option\n"
-" buffer: sort channels by order of buffers in the autojoin option\n"
+"   sort: sort alphabetically channels in the autojoin option; with "
+"\"buffer\": first sort by buffer number, then alphabetically\n"
 "\n"
 "Examples:\n"
 "  /autojoin add\n"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 2e8f1c06c..1e8ec65c4 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -6904,8 +6904,8 @@ irc_command_init ()
            "    key: key for the channel\n"
            "  apply: set currently joined channels in the autojoin option\n"
            "   join: join the channels in the autojoin option\n"
-           "   sort: sort alphabetically channels in the autojoin option\n"
-           " buffer: sort channels by order of buffers in the autojoin option\n"
+           "   sort: sort alphabetically channels in the autojoin option; "
+           "with \"buffer\": first sort by buffer number, then alphabetically\n"
            "\n"
            "Examples:\n"
            "  /autojoin add\n"