diff --git a/doc/de/autogen/user/irc_commands.adoc b/doc/de/autogen/user/irc_commands.adoc
index a38452dd7..fed3afafa 100644
--- a/doc/de/autogen/user/irc_commands.adoc
+++ b/doc/de/autogen/user/irc_commands.adoc
@@ -720,33 +720,33 @@ reason: Grund der Abmeldung
 * `+server+`: auflisten, hinzufügen oder entfernen von IRC-Servern
 
 ----
-/server  list|listfull [<server>]
-         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <server> <new_name>
-         reorder <server> [<server>...]
-         open <server>|-all [<server>...]
-         del|keep <server>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
          deloutq|jump|raw
 
-    list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-listfull: listet alle Server auf, mit detaillierten Informationen zu jedem einzelnen Server
-     add: erstellt einen neuen Server
-  server: Servername, dient der internen Nutzung und zur Darstellung
-hostname: Name oder IP-Adresse des Servers. Optional kann zusätzlich der Port festgelegt werden (Standard-Port: 6667). Verschiedene Ports können durch Kommata getrennt werden
-   -temp: erstellt temporären Server (wird nicht gespeichert)
-  option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
-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
-    open: öffnen den Serverbuffer, ohne eine Verbindung herzustellen
-    keep: übernimmt den Server in die Konfigurationsdatei (nur sinnvoll bei temporär angelegten 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)
-    jump: springt zum Server-Buffer
-     raw: öffnet Buffer mit Roh-IRC-Daten
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: add a new server
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a 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
+    open: open the server buffer without connecting
+    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
 
-Beispiele:
+Examples:
   /server listfull
   /server add freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
diff --git a/doc/en/autogen/user/irc_commands.adoc b/doc/en/autogen/user/irc_commands.adoc
index ba2d5321c..cf14e6c1f 100644
--- a/doc/en/autogen/user/irc_commands.adoc
+++ b/doc/en/autogen/user/irc_commands.adoc
@@ -720,18 +720,18 @@ reason: reason
 * `+server+`: list, add or remove IRC servers
 
 ----
-/server  list|listfull [<server>]
-         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <server> <new_name>
-         reorder <server> [<server>...]
-         open <server>|-all [<server>...]
-         del|keep <server>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
          deloutq|jump|raw
 
     list: list servers (without argument, this list is displayed)
 listfull: list servers with detailed info for each server
      add: add a new server
-  server: server name, for internal and display use
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
 hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
    -temp: add a temporary server (not saved)
   option: set option for server (for boolean option, value can be omitted)
diff --git a/doc/fr/autogen/user/irc_commands.adoc b/doc/fr/autogen/user/irc_commands.adoc
index c268d77b7..ad18a10bb 100644
--- a/doc/fr/autogen/user/irc_commands.adoc
+++ b/doc/fr/autogen/user/irc_commands.adoc
@@ -720,31 +720,31 @@ raison : raison
 * `+server+`: lister, ajouter ou retirer des serveurs IRC
 
 ----
-/server  list|listfull [<serveur>]
-         add <serveur> <nom>[/<port>] [-temp] [-<option>[=<valeur>]] [-no<option>]
-         copy|rename <serveur> <nouveau_nom>
-         reorder <serveur> [<serveur>...]
-         open <serveur>|-all [<serveur>...]
-         del|keep <serveur>
+/server  list|listfull [<nom>]
+         add <nom> <nom_machine>[/<port>] [-temp] [-<option>[=<valeur>]] [-no<option>]
+         copy|rename <nom> <nouveau_nom>
+         reorder <nom> [<nom>...]
+         open <nom>|-all [<nom>...]
+         del|keep <nom>
          deloutq|jump|raw
 
-    list : afficher les serveurs (sans paramètre, cette liste est affichée)
-listfull : afficher les serveurs avec de l'info détaillée pour chaque
-     add : ajouter un nouveau serveur
- serveur : nom du serveur, pour usage interne et affichage
-     nom : nom ou adresse IP du serveur avec port en option (défaut : 6667), plusieurs adresses peuvent être séparées par une virgule
-   -temp : ajouter un serveur temporaire (non sauvé)
-  option : définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
-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
-    open : ouvrir le tampon du serveur sans s'y connecter
-    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)
-    jump : sauter au tampon du serveur
-     raw : ouvre le tampon avec les données brutes IRC
+       list : afficher les serveurs (sans paramètre, cette liste est affichée)
+   listfull : afficher les serveurs avec de l'info détaillée pour chaque
+        add : ajouter un nouveau serveur
+        nom : nom du serveur, pour usage interne et affichage ; ce nom est utilisé pour se connecter au serveur (/connect nom) et pour définir les options du serveur : irc.server.name.xxx
+nom_machine : nom ou adresse IP du serveur avec port en option (défaut : 6667), plusieurs adresses peuvent être séparées par une virgule
+      -temp : ajouter un serveur temporaire (non sauvé)
+     option : définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
+   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
+       open : ouvrir le tampon du serveur sans s'y connecter
+       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)
+       jump : sauter au tampon du serveur
+        raw : ouvre le tampon avec les données brutes IRC
 
 Exemples :
   /server listfull
diff --git a/doc/it/autogen/user/irc_commands.adoc b/doc/it/autogen/user/irc_commands.adoc
index 96c9437e9..53c6e6672 100644
--- a/doc/it/autogen/user/irc_commands.adoc
+++ b/doc/it/autogen/user/irc_commands.adoc
@@ -720,18 +720,18 @@ motivo: motivo
 * `+server+`: elenca, aggiunge o rimuove server IRC
 
 ----
-/server  list|listfull [<server>]
-         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <server> <new_name>
-         reorder <server> [<server>...]
-         open <server>|-all [<server>...]
-         del|keep <server>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
          deloutq|jump|raw
 
     list: list servers (without argument, this list is displayed)
 listfull: list servers with detailed info for each server
      add: add a new server
-  server: server name, for internal and display use
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
 hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
    -temp: add a temporary server (not saved)
   option: set option for server (for boolean option, value can be omitted)
diff --git a/doc/ja/autogen/user/irc_commands.adoc b/doc/ja/autogen/user/irc_commands.adoc
index 845306fe4..ff9f21214 100644
--- a/doc/ja/autogen/user/irc_commands.adoc
+++ b/doc/ja/autogen/user/irc_commands.adoc
@@ -720,33 +720,33 @@ reason: 理由
 * `+server+`: IRC サーバのリストアップ、追加、削除
 
 ----
-/server  list|listfull [<server>]
-         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <server> <new_name>
-         reorder <server> [<server>...]
-         open <server>|-all [<server>...]
-         del|keep <server>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
          deloutq|jump|raw
 
-    list: サーバをリストアップ (引数無しでは、リストが表示されます)
-listfull: 詳細情報を含めてサーバをリストアップ
-     add: 新しいサーバを追加
-  server: サーバ名、内部的な利用と表示に利用
-hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切ってください
-   -temp: 一時的なサーバを追加 (保存されない)
-  option: サーバのオプションを設定 (ブールオプションでは値が無視されます)
-nooption: ブールオプションを 'off' に設定 (例: -nossl)
-    copy: サーバを複製
-  rename: サーバをリネーム
- reorder: サーバリストにおける順番を入れ替えます
-    open: 接続せずにサーババッファを開く
-    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: add a new server
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a 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
+    open: open the server buffer without connecting
+    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 freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
diff --git a/doc/pl/autogen/user/irc_commands.adoc b/doc/pl/autogen/user/irc_commands.adoc
index ca7ca18b7..3aa60250d 100644
--- a/doc/pl/autogen/user/irc_commands.adoc
+++ b/doc/pl/autogen/user/irc_commands.adoc
@@ -720,32 +720,33 @@ powód: powód
 * `+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>
-         reorder <serwer> [<serwer>...]
-         open <serwer>|-all [<serwer>...]
-         del|keep <serwer>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
          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
- reorder: zmienia kolejność na liście serwerów
-    open: otwiera bufor serwera nie łącząc się z nim
-    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: add a new server
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a 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
+    open: open the server buffer without connecting
+    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 freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
diff --git a/po/cs.po b/po/cs.po
index e8684867e..620a5e5f9 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7506,10 +7506,10 @@ msgstr "vypíše, přídá nebo odebere IRC servery"
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|"
@@ -7520,7 +7520,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/de.po b/po/de.po
index f7ada3dc2..baaf31dbc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-04-01 14:12+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -9004,22 +9004,26 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "auflisten, hinzufügen oder entfernen von IRC-Servern"
 
+#, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
 "reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
 "keep <server> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/es.po b/po/es.po
index 93baf5e90..d12c84c88 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7760,10 +7760,10 @@ msgstr "lista, añade o elimina servidores IRC"
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<servidor>] || add <servidor> <hostname>[/<puerto>] [-temp] [-"
 "<opción>[=<valor>]] [-no<opción>] || copy|rename <servidor> <nuevo_nombre> "
@@ -7774,7 +7774,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/fr.po b/po/fr.po
index 25246d461..89b3128f3 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: 2018-04-01 08:41+0200\n"
-"PO-Revision-Date: 2018-04-01 08:43+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
+"PO-Revision-Date: 2018-04-06 21:22+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -8821,21 +8821,23 @@ msgid "list, add or remove IRC servers"
 msgstr "lister, ajouter ou retirer des serveurs IRC"
 
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
-"list|listfull [<serveur>] || add <serveur> <nom>[/<port>] [-temp] [-"
-"<option>[=<valeur>]] [-no<option>] || copy|rename <serveur> <nouveau_nom> || "
-"reorder <serveur> [<serveur>...] || open <serveur>|-all [<serveur>...] || "
-"del|keep <serveur> || deloutq|jump|raw"
+"list|listfull [<nom>] || add <nom> <nom_machine>[/<port>] [-temp] [-"
+"<option>[=<valeur>]] [-no<option>] || copy|rename <nom> <nouveau_nom> || "
+"reorder <nom> [<nom>...] || open <nom>|-all [<nom>...] || del|keep <nom> || "
+"deloutq|jump|raw"
 
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
@@ -8863,28 +8865,31 @@ msgid ""
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
-"    list : afficher les serveurs (sans paramètre, cette liste est affichée)\n"
-"listfull : afficher les serveurs avec de l'info détaillée pour chaque\n"
-"     add : ajouter un nouveau serveur\n"
-" serveur : nom du serveur, pour usage interne et affichage\n"
-"     nom : nom ou adresse IP du serveur avec port en option (défaut : 6667), "
-"plusieurs adresses peuvent être séparées par une virgule\n"
-"   -temp : ajouter un serveur temporaire (non sauvé)\n"
-"  option : définir l'option pour le serveur (pour une option booléenne, la "
-"valeur peut être omise)\n"
-"nooption : définir l'option booléenne à 'off' (par exemple : -nossl)\n"
-"    copy : dupliquer un serveur\n"
-"  rename : renommer un serveur\n"
-" reorder : réordonner la liste des serveurs\n"
-"    open : ouvrir le tampon du serveur sans s'y connecter\n"
-"    keep : garder le serveur dans le fichier de configuration (pour les "
+"       list : afficher les serveurs (sans paramètre, cette liste est "
+"affichée)\n"
+"   listfull : afficher les serveurs avec de l'info détaillée pour chaque\n"
+"        add : ajouter un nouveau serveur\n"
+"        nom : nom du serveur, pour usage interne et affichage ; ce nom est "
+"utilisé pour se connecter au serveur (/connect nom) et pour définir les "
+"options du serveur : irc.server.name.xxx\n"
+"nom_machine : nom ou adresse IP du serveur avec port en option (défaut : "
+"6667), plusieurs adresses peuvent être séparées par une virgule\n"
+"      -temp : ajouter un serveur temporaire (non sauvé)\n"
+"     option : définir l'option pour le serveur (pour une option booléenne, "
+"la valeur peut être omise)\n"
+"   nooption : définir l'option booléenne à 'off' (par exemple : -nossl)\n"
+"       copy : dupliquer un serveur\n"
+"     rename : renommer un serveur\n"
+"    reorder : réordonner la liste des serveurs\n"
+"       open : ouvrir le tampon du serveur sans s'y connecter\n"
+"       keep : garder le serveur dans le fichier de configuration (pour les "
 "serveurs temporaires seulement)\n"
-"     del : supprimer un serveur\n"
-" deloutq : supprimer la file d'attente des messages sortants pour tous les "
-"serveurs (tous les messages que WeeChat est actuellement en train "
+"        del : supprimer un serveur\n"
+"    deloutq : supprimer la file d'attente des messages sortants pour tous "
+"les serveurs (tous les messages que WeeChat est actuellement en train "
 "d'envoyer)\n"
-"    jump : sauter au tampon du serveur\n"
-"     raw : ouvre le tampon avec les données brutes IRC\n"
+"       jump : sauter au tampon du serveur\n"
+"        raw : ouvre le tampon avec les données brutes IRC\n"
 "\n"
 "Exemples :\n"
 "  /server listfull\n"
diff --git a/po/hu.po b/po/hu.po
index bb5c5fb6b..84aa5ee24 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6931,10 +6931,10 @@ msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks "
@@ -6947,7 +6947,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/it.po b/po/it.po
index 7c7373b95..ea39699b3 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7937,10 +7937,10 @@ msgstr "elenca, aggiunge o rimuove server IRC"
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <host>[/<porta>] [-temp] [-"
 "<opzione>[=<valore>]] [-no<option>] || copy|rename <server> <nuovo_nome> || "
@@ -7951,7 +7951,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/ja.po b/po/ja.po
index 9afae1c99..a0231d1b6 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -8471,22 +8471,26 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "IRC サーバのリストアップ、追加、削除"
 
+#, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
 "reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
 "keep <server> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/pl.po b/po/pl.po
index 1c7a618c0..9879ba947 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <>\n"
@@ -8618,22 +8618,26 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "wyświetla, dodaje lub usuwa serwery IRC"
 
+#, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<serwer>] || add <serwera> <host>[/<port>] [-temp] [-"
 "<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa> || "
 "reorder <serwer> [<serwer>...] || open <serwer>|-all [<serwer>...] || del|"
 "keep <serwer> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/pt.po b/po/pt.po
index d7b090860..5d4d04a54 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -8308,10 +8308,10 @@ msgstr "listar, adicionar ou remover servidores IRC"
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<servidor>] || add <servidor> <hostname>[/<porta>] [-temp] [-"
 "<opção>[=<valor>]] [-no<opção>] || copy|rename <servidor> <novo_nome> || "
@@ -8322,7 +8322,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f0d0de38..59877ca2e 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:37+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7453,17 +7453,19 @@ msgid "list, add or remove IRC servers"
 msgstr ""
 
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/ru.po b/po/ru.po
index ee39ae1ee..88e8f73a0 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2018-03-31 15:37+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6968,10 +6968,10 @@ msgstr "перечислить, добавить или удалить серв
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-"
 "temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] "
@@ -6984,7 +6984,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/tr.po b/po/tr.po
index b260f7163..dec178605 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+0200\n"
 "PO-Revision-Date: 2017-06-26 23:33+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6325,10 +6325,10 @@ msgstr "İRC sunucularını listele, ekle veya kaldır"
 
 #, fuzzy
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<sunucu>] || add <sunucu> <hostname>[/<port>] [-temp] [-"
 "<seçenek>[=<değer>]] [-no<seçenek>] || copy|rename <sunucu> <yeni_isim> || "
@@ -6339,7 +6339,9 @@ msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 8d60ac327..a20d235ce 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: 2018-04-01 08:41+0200\n"
+"POT-Creation-Date: 2018-04-06 21:19+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"
@@ -6247,17 +6247,19 @@ msgid "list, add or remove IRC servers"
 msgstr ""
 
 msgid ""
-"list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
-"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
-"keep <server> || deloutq|jump|raw"
+"list|listfull [<name>] || add <name> <hostname>[/<port>] [-temp] [-"
+"<option>[=<value>]] [-no<option>] || copy|rename <name> <new_name> || "
+"reorder <name> [<name>...] || open <name>|-all [<name>...] || del|keep "
+"<name> || deloutq|jump|raw"
 msgstr ""
 
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
 "     add: add a new server\n"
-"  server: server name, for internal and display use\n"
+"    name: server name, for internal and display use; this name is used to "
+"connect to the server (/connect name) and to set server options: irc.server."
+"name.xxx\n"
 "hostname: name or IP address of server, with optional port (default: 6667), "
 "many addresses can be separated by a comma\n"
 "   -temp: add a temporary server (not saved)\n"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index a69482128..fb533f01b 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -6863,18 +6863,20 @@ irc_command_init ()
     weechat_hook_command (
         "server",
         N_("list, add or remove IRC servers"),
-        N_("list|listfull [<server>]"
-           " || add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] "
+        N_("list|listfull [<name>]"
+           " || add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] "
            "[-no<option>]"
-           " || copy|rename <server> <new_name>"
-           " || reorder <server> [<server>...]"
-           " || open <server>|-all [<server>...]"
-           " || del|keep <server>"
+           " || copy|rename <name> <new_name>"
+           " || reorder <name> [<name>...]"
+           " || open <name>|-all [<name>...]"
+           " || del|keep <name>"
            " || deloutq|jump|raw"),
         N_("    list: list servers (without argument, this list is displayed)\n"
            "listfull: list servers with detailed info for each server\n"
            "     add: add a new server\n"
-           "  server: server name, for internal and display use\n"
+           "    name: server name, for internal and display use; this name "
+           "is used to connect to the server (/connect name) and to set server "
+           "options: irc.server.name.xxx\n"
            "hostname: name or IP address of server, with optional port "
            "(default: 6667), many addresses can be separated by a comma\n"
            "   -temp: add a temporary server (not saved)\n"