diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.asciidoc index 92a4d9e12..0f930cfde 100644 --- a/doc/de/autogen/user/irc_commands.asciidoc +++ b/doc/de/autogen/user/irc_commands.asciidoc @@ -94,20 +94,20 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei 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 genutzen 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 +clear: clear the capabilities currently enabled + 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, 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 diff --git a/doc/en/autogen/user/irc_commands.asciidoc b/doc/en/autogen/user/irc_commands.asciidoc index 92f396bc3..bad6bdc75 100644 --- a/doc/en/autogen/user/irc_commands.asciidoc +++ b/doc/en/autogen/user/irc_commands.asciidoc @@ -103,7 +103,7 @@ clear: clear the capabilities currently enabled Without argument, "ls" and "list" are sent. -Capabilities supported by WeeChat are: account-notify, away-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. 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). diff --git a/doc/fr/autogen/user/irc_commands.asciidoc b/doc/fr/autogen/user/irc_commands.asciidoc index 78fc52591..ccc92b9e2 100644 --- a/doc/fr/autogen/user/irc_commands.asciidoc +++ b/doc/fr/autogen/user/irc_commands.asciidoc @@ -103,7 +103,7 @@ clear : effacer les capacités actuellement activées Sans paramètre, "ls" et "list" sont envoyés. -Les capacités supportées par WeeChat sont : account-notify, away-notify, extended-join, multi-prefix, server-time, userhost-in-names. +Les capacités supportées par WeeChat sont : account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names. Les capacités à activer automatiquement sur les serveurs peuvent être définies dans l'opion irc.server_default.capabilities (ou par serveur dans l'option irc.server.xxx.capabilities). diff --git a/doc/it/autogen/user/irc_commands.asciidoc b/doc/it/autogen/user/irc_commands.asciidoc index 4d026f677..5ca4d2a5c 100644 --- a/doc/it/autogen/user/irc_commands.asciidoc +++ b/doc/it/autogen/user/irc_commands.asciidoc @@ -103,7 +103,7 @@ clear: clear the capabilities currently enabled Without argument, "ls" and "list" are sent. -Capabilities supported by WeeChat are: account-notify, away-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. 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). diff --git a/doc/ja/autogen/user/irc_commands.asciidoc b/doc/ja/autogen/user/irc_commands.asciidoc index 377d9e82c..c415da751 100644 --- a/doc/ja/autogen/user/irc_commands.asciidoc +++ b/doc/ja/autogen/user/irc_commands.asciidoc @@ -94,20 +94,20 @@ channel: チャンネル名 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 +clear: clear the capabilities currently enabled + end: end the capability negotiation -引数無しの場合、"ls" と "list" を送信します。 +Without argument, "ls" and "list" are sent. -WeeChat がサポートする機能: account-notify、away-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 diff --git a/doc/pl/autogen/user/irc_commands.asciidoc b/doc/pl/autogen/user/irc_commands.asciidoc index e4ce39034..49f27833c 100644 --- a/doc/pl/autogen/user/irc_commands.asciidoc +++ b/doc/pl/autogen/user/irc_commands.asciidoc @@ -103,7 +103,7 @@ clear: clear the capabilities currently enabled Without argument, "ls" and "list" are sent. -Capabilities supported by WeeChat are: account-notify, away-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. 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). diff --git a/po/cs.po b/po/cs.po index b4754a390..1e5afe6c2 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-29 21:09+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -5587,8 +5587,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/de.po b/po/de.po index 501fc5399..59a3deae6 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-10-04 07:57+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German <>\n" @@ -6548,6 +6548,7 @@ msgstr "Aushandlung der Clientfähigkeit" msgid "ls || list || req|ack [ [...]] || clear || end" msgstr "ls || list || req|ack [ [...]] || clear || end" +#, fuzzy msgid "" " ls: list the capabilities supported by the server\n" " list: list the capabilities currently enabled\n" @@ -6558,8 +6559,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/es.po b/po/es.po index c56a8d217..aee820534 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-30 20:55+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5816,8 +5816,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/fr.po b/po/fr.po index aff26a948..97d54be21 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: 2015-10-18 18:57+0200\n" -"PO-Revision-Date: 2015-10-18 18:58+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" +"PO-Revision-Date: 2015-10-18 19:06+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -6413,8 +6413,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." @@ -6435,8 +6435,8 @@ msgstr "" "\n" "Sans paramètre, \"ls\" et \"list\" sont envoyés.\n" "\n" -"Les capacités supportées par WeeChat sont : account-notify, away-notify, " -"extended-join, multi-prefix, server-time, userhost-in-names.\n" +"Les capacités supportées par WeeChat sont : account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "Les capacités à activer automatiquement sur les serveurs peuvent être " "définies dans l'opion irc.server_default.capabilities (ou par serveur dans " diff --git a/po/hu.po b/po/hu.po index 3b9a43a0f..1b302b992 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-09 09:13+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5111,8 +5111,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/it.po b/po/it.po index 9019e72b7..a154513b6 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-30 20:55+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -5965,8 +5965,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/ja.po b/po/ja.po index f74e6fa61..561c0c51f 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-10-07 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6124,6 +6124,7 @@ msgstr "クライアント機能情報の交換" msgid "ls || list || req|ack [ [...]] || clear || end" msgstr "ls || list || req|ack [ [...]] || clear || end" +#, fuzzy msgid "" " ls: list the capabilities supported by the server\n" " list: list the capabilities currently enabled\n" @@ -6134,8 +6135,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/pl.po b/po/pl.po index 7c438feb2..e9fff72fe 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-30 20:56+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6274,8 +6274,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/pt_BR.po b/po/pt_BR.po index 746863ab7..cb9d5e7ec 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-30 20:56+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -5690,8 +5690,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/ru.po b/po/ru.po index 15065d596..5cd87916c 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-09-09 09:13+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5153,8 +5153,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/tr.po b/po/tr.po index 452afc2ff..c927f4c7e 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2015-03-10 21:33+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -4678,8 +4678,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/po/weechat.pot b/po/weechat.pot index 657b11a32..a7143cb08 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: 2015-10-18 18:57+0200\n" +"POT-Creation-Date: 2015-10-18 19:03+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -4666,8 +4666,8 @@ msgid "" "\n" "Without argument, \"ls\" and \"list\" are sent.\n" "\n" -"Capabilities supported by WeeChat are: account-notify, away-notify, extended-" -"join, multi-prefix, server-time, userhost-in-names.\n" +"Capabilities supported by WeeChat are: account-notify, away-notify, cap-" +"notify, extended-join, multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set in option irc." "server_default.capabilities (or by server in option irc.server.xxx." diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index a5bb53559..cc976e585 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -6150,7 +6150,7 @@ irc_command_init () "Without argument, \"ls\" and \"list\" are sent.\n" "\n" "Capabilities supported by WeeChat are: " - "account-notify, away-notify, extended-join, " + "account-notify, away-notify, cap-notify, extended-join, " "multi-prefix, server-time, userhost-in-names.\n" "\n" "The capabilities to automatically enable on servers can be set " diff --git a/src/plugins/irc/irc-command.h b/src/plugins/irc/irc-command.h index 358bc6385..236167ed8 100644 --- a/src/plugins/irc/irc-command.h +++ b/src/plugins/irc/irc-command.h @@ -45,9 +45,8 @@ struct t_irc_channel; /* list of supported capabilities (for completion in command /cap) */ #define IRC_COMMAND_CAP_SUPPORTED_COMPLETION \ - "account-notify|away-notify|extended-join|" \ - "multi-prefix|server-time|userhost-in-names" \ - "|%*" + "account-notify|away-notify|cap-notify|extended-join|" \ + "multi-prefix|server-time|userhost-in-names|%*" extern void irc_command_away_server (struct t_irc_server *server, const char *arguments,