diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.asciidoc
index bcf653a42..77004f25d 100644
--- a/doc/de/autogen/user/irc_commands.asciidoc
+++ b/doc/de/autogen/user/irc_commands.asciidoc
@@ -675,6 +675,7 @@ reason: Grund der Abmeldung
 /server  list|listfull [<server>]
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
+         reorder <server> [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
@@ -688,6 +689,7 @@ hostname: Name oder IP-Adresse des Servers. Optional kann noch der Port festgele
 nooption: stellt die Boolean Einstellung auf "off" (Beispiel: -nossl)
     copy: erstellt eine Kopie des Servers
   rename: benennt den Server um
+ reorder: Anordnung der Server ändern
     keep: behält den Server in der Konfigurationsdatei (ausschließlich für die Nutzung bei temporären Servern)
      del: entfernt einen Server
  deloutq: löscht bei allen Servern alle ausgehende Nachrichten, die in der Warteschlange stehen (dies betrifft alle Nachrichten die WeeChat gerade sendet)
@@ -702,6 +704,7 @@ Beispiele:
   /server add freenode3 chat.freenode.net -password=mypass
   /server copy oftc oftcbis
   /server rename oftc newoftc
+  /server reorder oftc freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/de/autogen/user/irc_options.asciidoc b/doc/de/autogen/user/irc_options.asciidoc
index 98860cae6..6ebc0ddb8 100644
--- a/doc/de/autogen/user/irc_options.asciidoc
+++ b/doc/de/autogen/user/irc_options.asciidoc
@@ -69,12 +69,12 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `default`)
 
 * [[option_irc.look.buffer_open_before_autojoin]] *irc.look.buffer_open_before_autojoin*
-** Beschreibung: `open channel buffer before the JOIN is received from server when it is auto joined (with server option "autojoin"); this is useful to open channels with always the same buffer numbers on startup`
+** Beschreibung: `betritt man automatisch einen Channel-Buffer (mittels autojoin Option) wird dieser direkt geöffnet, ohne auf die JOIN Nachricht des Servers zu warten; dies ist sinnvoll um die Channels immer an der selben Position bei einem Neustart zu öffnen`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_irc.look.buffer_open_before_join]] *irc.look.buffer_open_before_join*
-** Beschreibung: `open channel buffer before the JOIN is received from server when it is manually joined (with /join command)`
+** Beschreibung: `betritt man mittels dem /join Befehl einen Channel wird der Buffer direkt geöffnet, ohne auf die JOIN Nachricht des Servers zu warten`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
diff --git a/doc/en/autogen/user/irc_commands.asciidoc b/doc/en/autogen/user/irc_commands.asciidoc
index d8c28a733..63a3b90d1 100644
--- a/doc/en/autogen/user/irc_commands.asciidoc
+++ b/doc/en/autogen/user/irc_commands.asciidoc
@@ -675,6 +675,7 @@ reason: reason
 /server  list|listfull [<server>]
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
+         reorder <server> [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
@@ -688,6 +689,7 @@ hostname: name or IP address of server, with optional port (default: 6667), many
 nooption: set boolean option to 'off' (for example: -nossl)
     copy: duplicate a server
   rename: rename a server
+ reorder: reorder list of servers
     keep: keep server in config file (for temporary servers only)
      del: delete a server
  deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
@@ -702,6 +704,7 @@ Examples:
   /server add freenode3 chat.freenode.net -password=mypass
   /server copy oftc oftcbis
   /server rename oftc newoftc
+  /server reorder oftc freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/fr/autogen/user/irc_commands.asciidoc b/doc/fr/autogen/user/irc_commands.asciidoc
index 9c0ded866..1669c99ac 100644
--- a/doc/fr/autogen/user/irc_commands.asciidoc
+++ b/doc/fr/autogen/user/irc_commands.asciidoc
@@ -675,6 +675,7 @@ raison : raison
 /server  list|listfull [<serveur>]
          add <serveur> <nom>[/<port>] [-temp] [-<option>[=<valeur>]] [-no<option>]
          copy|rename <serveur> <nouveau_nom>
+         reorder <serveur> [<serveur>...]
          del|keep <serveur>
          deloutq|jump|raw
 
@@ -688,6 +689,7 @@ listfull : afficher les serveurs avec de l'info détaillée pour chaque
 nooption : définir l'option booléenne à 'off' (par exemple : -nossl)
     copy : dupliquer un serveur
   rename : renommer un serveur
+ reorder : réordonner la liste des serveurs
     keep : garder le serveur dans le fichier de configuration (pour les serveurs temporaires seulement)
      del : supprimer un serveur
  deloutq : supprimer la file d'attente des messages sortants pour tous les serveurs (tous les messages que WeeChat est actuellement en train d'envoyer)
@@ -702,6 +704,7 @@ Exemples :
   /server add freenode3 chat.freenode.net -password=mypass
   /server copy oftc oftcbis
   /server rename oftc newoftc
+  /server reorder oftc freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/it/autogen/user/irc_commands.asciidoc b/doc/it/autogen/user/irc_commands.asciidoc
index 74ed191b3..2a6b55cfd 100644
--- a/doc/it/autogen/user/irc_commands.asciidoc
+++ b/doc/it/autogen/user/irc_commands.asciidoc
@@ -673,35 +673,38 @@ motivo: motivo
 
 ----
 /server  list|listfull [<server>]
-         add <server> <host>[/<porta>] [-temp] [-<opzione>[=<valore>]] [-no<option>]
-         copy|rename <server> <nuovo_nome>
+         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <server> <new_name>
+         reorder <server> [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
-     list: elenca i server (senza argomento, viene mostrata questa lista)
- listfull: elenca i server con tutte le informazioni dettagliate
-      add: crea un nuovo server
-   server: nome server, per il solo uso interno e di visualizzazione
-nome_host: nome o indirizzo IP del server, con porta opzionale (predefinita: 6667), più indirizzi possono essere separati da virgole
-     temp: crea server temporaneo (non salvato)
-  opzione: imposta opzione per il server (per opzioni bool, il valore può essere omesso)
- nooption: imposta l'opzione bool su 'off' (per esempio: -nossl)
-     copy: duplica un server
-   rename: rinomina un server
-     keep: salva server nel file di configurazione (solo per server temporanei)
-      del: elimina un server
-  deloutq: elimina i messaggi fuori coda per tutti i server (tutti i messaggi che WeeChat sta inviando)
-     jump: passa al buffer del server
-      raw: apri buffer con dati raw IRC
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: create a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+    temp: create temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
 
-Esempi:
+Examples:
   /server listfull
   /server add oftc irc.oftc.net/6697 -ssl -autoconnect
   /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
   /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=miapassword
+  /server add freenode3 chat.freenode.net -password=mypass
   /server copy oftc oftcbis
   /server rename oftc newoftc
+  /server reorder oftc freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/ja/autogen/user/irc_commands.asciidoc b/doc/ja/autogen/user/irc_commands.asciidoc
index 2580a55d9..b68a24156 100644
--- a/doc/ja/autogen/user/irc_commands.asciidoc
+++ b/doc/ja/autogen/user/irc_commands.asciidoc
@@ -675,26 +675,28 @@ reason: 理由
 /server  list|listfull [<server>]
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
+         reorder <server> [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
-    list: サーバをリストアップ (引数無しでは、リストが表示される)
-listfull: 詳細情報を含めてサーバをリストアップ
-     add: 新しいサーバを作成
-  server: サーバ名、内部的な利用と表示に利用
-hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切る
-    temp: 一時的なサーバを作成 (保存されない)
-  option: サーバのオプションを設定 (ブールオプションでは値が無視される)
-nooption: ブールオプションを 'off' に設定 (例: -nossl)
-    copy: サーバを複製
-  rename: サーバをリネーム
-    keep: 設定ファイルにサーバを保存 (一時的なサーバ用)
-     del: サーバを削除
- deloutq: 全てのサーバにメッセージの削除を要求 (WeeChat が送信している全てのメッセージ)
-    jump: サーババッファに移動
-     raw: 生 IRC データを表示するバッファを開く
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: create a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+    temp: create temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
 
-例:
+Examples:
   /server listfull
   /server add oftc irc.oftc.net/6697 -ssl -autoconnect
   /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
@@ -702,6 +704,7 @@ nooption: ブールオプションを 'off' に設定 (例: -nossl)
   /server add freenode3 chat.freenode.net -password=mypass
   /server copy oftc oftcbis
   /server rename oftc newoftc
+  /server reorder oftc freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/ja/autogen/user/irc_options.asciidoc b/doc/ja/autogen/user/irc_options.asciidoc
index 3c2677182..c8a6f6799 100644
--- a/doc/ja/autogen/user/irc_options.asciidoc
+++ b/doc/ja/autogen/user/irc_options.asciidoc
@@ -69,12 +69,12 @@
 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" (デフォルト値: `default`)
 
 * [[option_irc.look.buffer_open_before_autojoin]] *irc.look.buffer_open_before_autojoin*
-** 説明: `open channel buffer before the JOIN is received from server when it is auto joined (with server option "autojoin"); this is useful to open channels with always the same buffer numbers on startup`
+** 説明: `自動で参加した場合 ("autojoin" オプションで参加した場合) に、サーバから JOIN を受信する前にチャンネルバッファを開く; チャンネルとバッファ番号の対応を常に一致させたい場合に便利です`
 ** タイプ: ブール
 ** 値: on, off (デフォルト値: `on`)
 
 * [[option_irc.look.buffer_open_before_join]] *irc.look.buffer_open_before_join*
-** 説明: `open channel buffer before the JOIN is received from server when it is manually joined (with /join command)`
+** 説明: `手動で参加した場合 (/join コマンドを実行した場合) に、サーバから JOIN を受信する前にチャンネルバッファを開く`
 ** タイプ: ブール
 ** 値: on, off (デフォルト値: `off`)
 
@@ -564,7 +564,7 @@
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
 * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail*
-** 説明: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server`
+** 説明: `SASL 認証が失敗した場合の挙動: 認証の問題を無視する場合は "continue"、サーバへの再接続を予定する場合は "reconnect"、サーバから切断する場合は "disconnect"`
 ** タイプ: 整数
 ** 値: continue, reconnect, disconnect (デフォルト値: `continue`)
 
diff --git a/doc/pl/autogen/user/irc_commands.asciidoc b/doc/pl/autogen/user/irc_commands.asciidoc
index a329f9f0f..7f70f9833 100644
--- a/doc/pl/autogen/user/irc_commands.asciidoc
+++ b/doc/pl/autogen/user/irc_commands.asciidoc
@@ -672,35 +672,39 @@ powód: powód
 [command]*`server`* wyświetla, dodaje lub usuwa serwery IRC::
 
 ----
-/server  list|listfull [<serwer>]
-         add <serwera> <host>[/<port>] [-temp] [-<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa>
-         del|keep <serwer>]
+/server  list|listfull [<server>]
+         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <server> <new_name>
+         reorder <server> [<server>...]
+         del|keep <server>
          deloutq|jump|raw
 
-    list: wyświetla listę serwerów (bez argumentu wyświetlana jest ta lista)
-listfull: wyświetla listę serwerów ze szczegółowymi informacjami dla każdego serwera
-     add: tworzy nowy serwer
-  serwer: nazwa serwera, do użytku wewnętrznego i  wyświetlania
-host: nazwa albo adres IP serwera, z opcjonalnym numerem portu (domyślnie: 6667), wiele adresów należy rozdzielić przecinkiem
-    temp: tworzy serwer tymczasowy (nie zapisany)
-  opcja: ustawia opcję dla serwera (dla opcji boolowskich wartość może zostać pominięta)
-noopcja: ustawia opcje boolowskie na 'off' (na przykład: -nossl)
-    copy: duplikuje serwer
-  rename: zmienia nazwę serwera
-    keep: zachowuje serwer w pliku konfiguracyjnym (tylko dla serwerów tymczasowych)
-     del: usuwa serwer
- deloutq: usuń wiadomości z kolejki dla wszystkich serwerów (wszystkie wiadomości jakie WeeChat obecnie wysyła)
-    jump: przechodzi do bufora serwera
-     raw: otwiera bufor z nieprzetworzonymi danymi IRC
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: create a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+    temp: create temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
 
-Przykłady:
+Examples:
   /server listfull
   /server add oftc irc.oftc.net/6697 -ssl -autoconnect
   /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
   /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=moje_hasło
+  /server add freenode3 chat.freenode.net -password=mypass
   /server copy oftc oftcbis
   /server rename oftc newoftc
+  /server reorder oftc freenode
   /server del freenode
   /server deloutq
 ----