irc: remove argument "clear" from command /cap (issue #8, closes #641)

19 files changed, 70 insertions, 112 deletions

diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.asciidoc
index 2322186fc..f52227a1b 100644
--- a/doc/de/autogen/user/irc_commands.asciidoc
+++ b/doc/de/autogen/user/irc_commands.asciidoc
@@ -91,26 +91,23 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei
 /cap  ls
       list
       req|ack [<capability> [<capability>...]]
-      clear
       end
 
-   ls: führt alle Fähigkeiten auf die vom Server unterstützt werden
- list: führt alle Fähigkeiten auf die aktuell genutzt werden
-  req: fordert eine Fähigkeit an
-  ack: bestätigt eine Fähigkeit die von Serverseite eine Bestätigung erfordert
-clear: löscht die aktuell genutzten Fähigkeiten
-  end: beendet die Übertragung von Fähigkeiten
+   ls: list the capabilities supported by the server
+ list: list the capabilities currently enabled
+  req: request a capability
+  ack: acknowledge capabilities which require client-side acknowledgement
+  end: end the capability negotiation
 
-Ohne Angaben von Argumenten werden "ls" und "list" gesendet.
+Without argument, "ls" and "list" are sent.
 
-Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names.
+Capabilities supported by WeeChat are: account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names.
 
-Fähigkeiten die standardmäßig genutzt werden sollen können mit der Option  irc.server_default.capabilities gesetzt werden (oder individuell für jeden Server mit der Option irc.server.xxx.capabilities).
+The capabilities to automatically enable on servers can be set in option irc.server_default.capabilities (or by server in option irc.server.xxx.capabilities).
 
-Beispiele:
+Examples:
    /cap
-   /cap req multi-prefix
-   /cap clear
+   /cap req multi-prefix away-notify
 ----
 
 [[command_irc_connect]]
diff --git a/doc/en/autogen/user/irc_commands.asciidoc b/doc/en/autogen/user/irc_commands.asciidoc
index bad6bdc75..b8a469d11 100644
--- a/doc/en/autogen/user/irc_commands.asciidoc
+++ b/doc/en/autogen/user/irc_commands.asciidoc
@@ -91,14 +91,12 @@ Without argument, this command displays the ban list for current channel.
 /cap  ls
       list
       req|ack [<capability> [<capability>...]]
-      clear
       end
 
    ls: list the capabilities supported by the server
  list: list the capabilities currently enabled
   req: request a capability
   ack: acknowledge capabilities which require client-side acknowledgement
-clear: clear the capabilities currently enabled
   end: end the capability negotiation
 
 Without argument, "ls" and "list" are sent.
@@ -109,8 +107,7 @@ The capabilities to automatically enable on servers can be set in option irc.ser
 
 Examples:
    /cap
-   /cap req multi-prefix
-   /cap clear
+   /cap req multi-prefix away-notify
 ----
 
 [[command_irc_connect]]
diff --git a/doc/fr/autogen/user/irc_commands.asciidoc b/doc/fr/autogen/user/irc_commands.asciidoc
index ccc92b9e2..2bf1c1749 100644
--- a/doc/fr/autogen/user/irc_commands.asciidoc
+++ b/doc/fr/autogen/user/irc_commands.asciidoc
@@ -91,14 +91,12 @@ Sans paramètre, cette commande affiche la liste des bannissements pour le canal
 /cap  ls
       list
       req|ack [<capacité> [<capacité>...]]
-      clear
       end
 
    ls : lister les capacités supportées par le serveur
  list : lister les capacités actuellement activées
   req : demander une capacité
   ack : accuser réception de capacités qui nécessitent un accusé de réception du client
-clear : effacer les capacités actuellement activées
   end : terminer la négociation de capacité
 
 Sans paramètre, "ls" et "list" sont envoyés.
@@ -109,8 +107,7 @@ Les capacités à activer automatiquement sur les serveurs peuvent être défini
 
 Exemples :
    /cap
-   /cap req multi-prefix
-   /cap clear
+   /cap req multi-prefix away-notify
 ----
 
 [[command_irc_connect]]
diff --git a/doc/it/autogen/user/irc_commands.asciidoc b/doc/it/autogen/user/irc_commands.asciidoc
index 5ca4d2a5c..496018dfd 100644
--- a/doc/it/autogen/user/irc_commands.asciidoc
+++ b/doc/it/autogen/user/irc_commands.asciidoc
@@ -91,14 +91,12 @@ Without argument, this command displays the ban list for current channel.
 /cap  ls
       list
       req|ack [<capability> [<capability>...]]
-      clear
       end
 
    ls: list the capabilities supported by the server
  list: list the capabilities currently enabled
   req: request a capability
   ack: acknowledge capabilities which require client-side acknowledgement
-clear: clear the capabilities currently enabled
   end: end the capability negotiation
 
 Without argument, "ls" and "list" are sent.
@@ -109,8 +107,7 @@ The capabilities to automatically enable on servers can be set in option irc.ser
 
 Examples:
    /cap
-   /cap req multi-prefix
-   /cap clear
+   /cap req multi-prefix away-notify
 ----
 
 [[command_irc_connect]]
diff --git a/doc/ja/autogen/user/irc_commands.asciidoc b/doc/ja/autogen/user/irc_commands.asciidoc
index 5a5b474a6..bc6b9738a 100644
--- a/doc/ja/autogen/user/irc_commands.asciidoc
+++ b/doc/ja/autogen/user/irc_commands.asciidoc
@@ -91,26 +91,23 @@ channel: チャンネル名
 /cap  ls
       list
       req|ack [<capability> [<capability>...]]
-      clear
       end
 
-   ls: サーバがサポートする機能をリスト
- list: 現在有効化されている機能をリスト
-  req: 機能情報を要求
-  ack: クライアント側に承認を要求する機能を承認
-clear: 現在有効化されている機能を無効化
-  end: 機能情報交換を終了
+   ls: list the capabilities supported by the server
+ list: list the capabilities currently enabled
+  req: request a capability
+  ack: acknowledge capabilities which require client-side acknowledgement
+  end: end the capability negotiation
 
-引数無しの場合、"ls" と "list" を送信します。
+Without argument, "ls" and "list" are sent.
 
-WeeChat がサポートする機能: account-notify、away-notify、cap-notify、extended-join、multi-prefix、server-time、userhost-in-names。
+Capabilities supported by WeeChat are: account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names.
 
-自動的に有効化する機能を設定するにはオプション irc.server_default.capabilities (または対象のサーバに関するオプション irc.server.xxx.capabilities) を使ってください。
+The capabilities to automatically enable on servers can be set in option irc.server_default.capabilities (or by server in option irc.server.xxx.capabilities).
 
-例:
+Examples:
    /cap
-   /cap req multi-prefix
-   /cap clear
+   /cap req multi-prefix away-notify
 ----
 
 [[command_irc_connect]]
diff --git a/doc/pl/autogen/user/irc_commands.asciidoc b/doc/pl/autogen/user/irc_commands.asciidoc
index 49f27833c..19869219f 100644
--- a/doc/pl/autogen/user/irc_commands.asciidoc
+++ b/doc/pl/autogen/user/irc_commands.asciidoc
@@ -91,14 +91,12 @@ Without argument, this command displays the ban list for current channel.
 /cap  ls
       list
       req|ack [<capability> [<capability>...]]
-      clear
       end
 
    ls: list the capabilities supported by the server
  list: list the capabilities currently enabled
   req: request a capability
   ack: acknowledge capabilities which require client-side acknowledgement
-clear: clear the capabilities currently enabled
   end: end the capability negotiation
 
 Without argument, "ls" and "list" are sent.
@@ -109,8 +107,7 @@ The capabilities to automatically enable on servers can be set in option irc.ser
 
 Examples:
    /cap
-   /cap req multi-prefix
-   /cap clear
+   /cap req multi-prefix away-notify
 ----
 
 [[command_irc_connect]]
diff --git a/po/cs.po b/po/cs.po
index fdbb7bc15..2213da4e3 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-20 17:33+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5634,7 +5634,8 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "%s%s: schopnost klienta, vyžaduji: sasl"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+#, fuzzy
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr "ls || list || req|ack [<schopnost> [<schopnost>...]] || clear || end"
 
 msgid ""
@@ -5642,7 +5643,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -5656,8 +5656,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/po/de.po b/po/de.po
index 04ec184f3..1133addb2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2016-01-02 16:56+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
@@ -6604,15 +6604,16 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "Aushandlung der Clientfähigkeit"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+#, fuzzy
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
 
+#, fuzzy
 msgid ""
 "   ls: list the capabilities supported by the server\n"
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -6626,8 +6627,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 "   ls: führt alle Fähigkeiten auf die vom Server unterstützt werden\n"
 " list: führt alle Fähigkeiten auf die aktuell genutzt werden\n"
diff --git a/po/es.po b/po/es.po
index c55d1a55d..c5a5f0f7b 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-02 19:26+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5851,7 +5851,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "%s%s: capabilidad del cliente, solicitando: %s"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -5859,7 +5859,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -5873,8 +5872,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/po/fr.po b/po/fr.po
index ae8ab7f1b..2a02c099c 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: 2016-01-02 10:06+0100\n"
-"PO-Revision-Date: 2016-01-02 10:07+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
+"PO-Revision-Date: 2016-01-03 08:56+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -6464,15 +6464,14 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "négociation de capacité client"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
-msgstr "ls || list || req|ack [<capacité> [<capacité>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
+msgstr "ls || list || req|ack [<capacité> [<capacité>...]] || end"
 
 msgid ""
 "   ls: list the capabilities supported by the server\n"
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -6486,15 +6485,13 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 "   ls : lister les capacités supportées par le serveur\n"
 " list : lister les capacités actuellement activées\n"
 "  req : demander une capacité\n"
 "  ack : accuser réception de capacités qui nécessitent un accusé de "
 "réception du client\n"
-"clear : effacer les capacités actuellement activées\n"
 "  end : terminer la négociation de capacité\n"
 "\n"
 "Sans paramètre, \"ls\" et \"list\" sont envoyés.\n"
@@ -6508,8 +6505,7 @@ msgstr ""
 "\n"
 "Exemples :\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 
 msgid "connect to IRC server(s)"
 msgstr "se connecter à un/plusieurs serveur(s) IRC"
diff --git a/po/hu.po b/po/hu.po
index 6a82c1569..864888feb 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-02 19:26+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5144,7 +5144,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -5152,7 +5152,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -5166,8 +5165,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 #, fuzzy
diff --git a/po/it.po b/po/it.po
index aca4fff79..e8f7753f8 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-02 19:26+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6000,7 +6000,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "%s%s: capacità del client, richiesta in corso: %s"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -6008,7 +6008,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -6022,8 +6021,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/po/ja.po b/po/ja.po
index dfbfdc049..5bba0087b 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-25 09:00+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -6184,15 +6184,16 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "クライアント機能情報の交換"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+#, fuzzy
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
 
+#, fuzzy
 msgid ""
 "   ls: list the capabilities supported by the server\n"
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -6206,8 +6207,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 "   ls: サーバがサポートする機能をリスト\n"
 " list: 現在有効化されている機能をリスト\n"
diff --git a/po/pl.po b/po/pl.po
index 612252408..a5102cb0e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-02 19:26+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6309,7 +6309,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "%s%s: możliwości klienta, żądanie: %s"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -6317,7 +6317,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -6331,8 +6330,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0160bc73c..5a9c84e5b 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-09-30 20:56+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5724,7 +5724,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr ""
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -5732,7 +5732,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -5746,8 +5745,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/po/ru.po b/po/ru.po
index bdb6aae2c..462e61ed2 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-12-02 19:26+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5186,7 +5186,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr "Не могу записать лог-файл \"%s\"\n"
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -5194,7 +5194,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -5208,8 +5207,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 #, fuzzy
diff --git a/po/tr.po b/po/tr.po
index fb70fcb95..ae7547a7b 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\n"
 "PO-Revision-Date: 2015-03-10 21:33+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4711,7 +4711,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr ""
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -4719,7 +4719,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -4733,8 +4732,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/po/weechat.pot b/po/weechat.pot
index 65865eb88..181215a94 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: 2016-01-02 10:06+0100\n"
+"POT-Creation-Date: 2016-01-03 08:56+0100\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"
@@ -4696,7 +4696,7 @@ msgstr ""
 msgid "client capability negotiation"
 msgstr ""
 
-msgid "ls || list || req|ack [<capability> [<capability>...]] || clear || end"
+msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
 msgstr ""
 
 msgid ""
@@ -4704,7 +4704,6 @@ msgid ""
 " list: list the capabilities currently enabled\n"
 "  req: request a capability\n"
 "  ack: acknowledge capabilities which require client-side acknowledgement\n"
-"clear: clear the capabilities currently enabled\n"
 "  end: end the capability negotiation\n"
 "\n"
 "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -4718,8 +4717,7 @@ msgid ""
 "\n"
 "Examples:\n"
 "   /cap\n"
-"   /cap req multi-prefix\n"
-"   /cap clear"
+"   /cap req multi-prefix away-notify"
 msgstr ""
 
 msgid "connect to IRC server(s)"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 81f6e8873..ddb3bf553 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -6148,13 +6148,12 @@ irc_command_init ()
         "cap",
         N_("client capability negotiation"),
         N_("ls || list || req|ack [<capability> [<capability>...]]"
-           " || clear || end"),
+           " || end"),
         N_("   ls: list the capabilities supported by the server\n"
            " list: list the capabilities currently enabled\n"
            "  req: request a capability\n"
            "  ack: acknowledge capabilities which require client-side "
            "acknowledgement\n"
-           "clear: clear the capabilities currently enabled\n"
            "  end: end the capability negotiation\n"
            "\n"
            "Without argument, \"ls\" and \"list\" are sent.\n"
@@ -6169,13 +6168,11 @@ irc_command_init ()
            "\n"
            "Examples:\n"
            "   /cap\n"
-           "   /cap req multi-prefix\n"
-           "   /cap clear"),
+           "   /cap req multi-prefix away-notify"),
         "ls"
         " || list"
         " || req " IRC_COMMAND_CAP_SUPPORTED_COMPLETION
         " || ack " IRC_COMMAND_CAP_SUPPORTED_COMPLETION
-        " || clear"
         " || end",
         &irc_command_cap, NULL);
     weechat_hook_command (