diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 77cda3641..056cbf569 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -101,6 +101,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * alias: change default command for alias /beep to "/print -beep" * exec: add exec plugin: new command /exec and file exec.conf * guile: fix module used after unload of a script +* irc: make reason optional in command /kill * irc: add support of message 324 (channel modes) in option irc.look.display_join_message (closes #75) * irc: add option irc.look.join_auto_add_chantype (closes #65) diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt index f729dd2e2..7871187b2 100644 --- a/doc/de/autogen/user/irc_commands.txt +++ b/doc/de/autogen/user/irc_commands.txt @@ -319,7 +319,7 @@ Beispiel: [command]*`kill`* Beende Client-Server Verbindung:: ---- -/kill +/kill [] nick: Nickname reason: Grund der Abmeldung diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt index 08b0c2286..05ca90997 100644 --- a/doc/en/autogen/user/irc_commands.txt +++ b/doc/en/autogen/user/irc_commands.txt @@ -319,7 +319,7 @@ Example: [command]*`kill`* close client-server connection:: ---- -/kill +/kill [] nick: nick reason: reason diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt index b546bac0b..5337a7c8d 100644 --- a/doc/fr/autogen/user/irc_commands.txt +++ b/doc/fr/autogen/user/irc_commands.txt @@ -319,7 +319,7 @@ Exemple : [command]*`kill`* fermer la connexion client-serveur:: ---- -/kill +/kill [] pseudo : pseudo raison : raison diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt index 9bfd6c1ab..f619c655b 100644 --- a/doc/it/autogen/user/irc_commands.txt +++ b/doc/it/autogen/user/irc_commands.txt @@ -319,7 +319,7 @@ Example: [command]*`kill`* chiude connessione client-server:: ---- -/kill +/kill [] nick: nick motivo: motivo diff --git a/doc/ja/autogen/user/irc_commands.txt b/doc/ja/autogen/user/irc_commands.txt index dc84973f5..ec96a6de7 100644 --- a/doc/ja/autogen/user/irc_commands.txt +++ b/doc/ja/autogen/user/irc_commands.txt @@ -319,7 +319,7 @@ channel: チャンネル名 [command]*`kill`* クライアント - サーバの接続を閉じる:: ---- -/kill +/kill [] nick: ニックネーム reason: 理由 diff --git a/doc/pl/autogen/user/irc_commands.txt b/doc/pl/autogen/user/irc_commands.txt index 89226b69c..ee82c1965 100644 --- a/doc/pl/autogen/user/irc_commands.txt +++ b/doc/pl/autogen/user/irc_commands.txt @@ -319,7 +319,7 @@ Example: [command]*`kill`* zamyka połączenie klient-serwer:: ---- -/kill +/kill [] nick: nick powód: powód diff --git a/po/cs.po b/po/cs.po index 9b3815133..94c99a399 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -5643,7 +5643,8 @@ msgstr "" msgid "close client-server connection" msgstr "zavřít spojení klient-server" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -6073,6 +6074,9 @@ msgstr "přinutit uživatele opustit kanál(y)" msgid "force a user to quit server with a reason" msgstr "přinutit uživatele opustit server s odůvodněním" +msgid " " +msgstr " " + msgid "register a new service" msgstr "zaregistrovat novou službu" diff --git a/po/de.po b/po/de.po index 8d84610e2..4a9145168 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-05-09 19:32+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -6500,7 +6500,8 @@ msgstr "" msgid "close client-server connection" msgstr "Beende Client-Server Verbindung" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -6934,6 +6935,9 @@ msgstr "Zwingt einen User den oder die Channel(s) zu verlassen" msgid "force a user to quit server with a reason" msgstr "Zwingt einen User den Server mit Begründung zu verlassen" +msgid " " +msgstr " " + msgid "register a new service" msgstr "Einen neuen Service eintragen" diff --git a/po/es.po b/po/es.po index dc79ab89c..f01401eaf 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5872,7 +5872,8 @@ msgstr "" msgid "close client-server connection" msgstr "cerrar la conexión cliente-servidor" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -6306,6 +6307,9 @@ msgstr "fuerza al usuario a abandonar el canal o canales" msgid "force a user to quit server with a reason" msgstr "fuerza a un usuario a salir del servidor con un mensaje de salida" +msgid " " +msgstr " " + msgid "register a new service" msgstr "registrar un nuevo servicio" diff --git a/po/fr.po b/po/fr.po index 2c40a55a9..2b2a58c22 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: 2014-05-08 11:17+0200\n" -"PO-Revision-Date: 2014-05-08 11:23+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" +"PO-Revision-Date: 2014-05-12 23:07+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -6362,8 +6362,8 @@ msgstr "" msgid "close client-server connection" msgstr "fermer la connexion client-serveur" -msgid " " -msgstr " " +msgid " []" +msgstr " []" msgid "" " nick: nick\n" @@ -6792,6 +6792,9 @@ msgstr "forcer un utilisateur à quitter un ou plusieurs canaux" msgid "force a user to quit server with a reason" msgstr "forcer un utilisateur à quitter le serveur avec une raison" +msgid " " +msgstr " " + msgid "register a new service" msgstr "enregistrer un nouveau service" diff --git a/po/hu.po b/po/hu.po index e24c9e517..603daa42a 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-05 16:12+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5141,7 +5141,7 @@ msgid "close client-server connection" msgstr "kliens-szerver kapcsolat bezárása" #, fuzzy -msgid " " +msgid " []" msgstr "név szöveg" #, fuzzy @@ -5555,6 +5555,10 @@ msgstr "felhasználó erőszakos eltávolítása a szobából" msgid "force a user to quit server with a reason" msgstr "felhasználó erőszakos eltávolítása a szobából" +#, fuzzy +msgid " " +msgstr "név szöveg" + msgid "register a new service" msgstr "új szolgáltatás regisztrálása" diff --git a/po/it.po b/po/it.po index ab0919689..9b0d34e65 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -6015,7 +6015,8 @@ msgstr "" msgid "close client-server connection" msgstr "chiude connessione client-server" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -6445,6 +6446,9 @@ msgstr "forza un utente a lasciare uno o più canali" msgid "force a user to quit server with a reason" msgstr "forza un utente ad abbandonare il server con un motivo" +msgid " " +msgstr " " + msgid "register a new service" msgstr "registra un nuovo servizio" diff --git a/po/ja.po b/po/ja.po index 5c5e6fb21..4720ff790 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-21 00:44+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6101,7 +6101,8 @@ msgstr "" msgid "close client-server connection" msgstr "クライアント - サーバの接続を閉じる" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -6521,6 +6522,9 @@ msgstr "強制的にユーザをチャンネルから退出" msgid "force a user to quit server with a reason" msgstr "ある理由で強制的にユーザをサーバから切断" +msgid " " +msgstr " " + msgid "register a new service" msgstr "新しいサービスを登録" diff --git a/po/pl.po b/po/pl.po index be4ffcb02..99e62f27a 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6148,7 +6148,8 @@ msgstr "" msgid "close client-server connection" msgstr "zamyka połączenie klient-serwer" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -6579,6 +6580,9 @@ msgstr "zmusza użytkownika do opuszczenia kanału(ów)" msgid "force a user to quit server with a reason" msgstr "zmusza użytkownika do opuszczenia serwera z powodem" +msgid " " +msgstr " " + msgid "register a new service" msgstr "rejestruje nową usługę" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2077435ba..13f8924d7 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-05 16:12+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -5551,7 +5551,8 @@ msgstr "" msgid "close client-server connection" msgstr "fecha conexão cliente-servidor" -msgid " " +#, fuzzy +msgid " []" msgstr " " msgid "" @@ -5877,6 +5878,9 @@ msgstr "forçar um usuário a deixar algum(s) canal(is)" msgid "force a user to quit server with a reason" msgstr "forçar um usuário a sair do servidor sem uma razão" +msgid " " +msgstr " " + msgid "register a new service" msgstr "registrar um novo serviço" diff --git a/po/ru.po b/po/ru.po index 836ed9eb7..0ddf17e57 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-04-05 16:12+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5175,7 +5175,7 @@ msgid "close client-server connection" msgstr "закрыть соединение клиент-сервер" #, fuzzy -msgid " " +msgid " []" msgstr "ник текст" #, fuzzy @@ -5586,6 +5586,10 @@ msgstr "принудительно удалить пользователя с к msgid "force a user to quit server with a reason" msgstr "принудительно удалить пользователя с канала" +#, fuzzy +msgid " " +msgstr "ник текст" + msgid "register a new service" msgstr "зарегистрировать новый сервис" diff --git a/po/tr.po b/po/tr.po index c8123efc8..74fe71d3e 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: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2014-03-24 14:23+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -4652,8 +4652,9 @@ msgstr "" msgid "close client-server connection" msgstr "" -msgid " " -msgstr "" +#, fuzzy +msgid " []" +msgstr " [...]" msgid "" " nick: nick\n" @@ -4974,6 +4975,9 @@ msgstr "" msgid "force a user to quit server with a reason" msgstr "" +msgid " " +msgstr "" + msgid "register a new service" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 04a594ad2..0007ddebb 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 11:17+0200\n" +"POT-Creation-Date: 2014-05-12 23:06+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -4646,7 +4646,7 @@ msgstr "" msgid "close client-server connection" msgstr "" -msgid " " +msgid " []" msgstr "" msgid "" @@ -4963,6 +4963,9 @@ msgstr "" msgid "force a user to quit server with a reason" msgstr "" +msgid " " +msgstr "" + msgid "register a new service" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 21870de3e..0c05c066c 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -2563,11 +2563,19 @@ irc_command_kill (void *data, struct t_gui_buffer *buffer, int argc, /* make C compiler happy */ (void) data; - if (argc < 3) + if (argc < 2) return WEECHAT_RC_ERROR; - irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, - "KILL %s :%s", argv[1], argv_eol[2]); + if (argc < 3) + { + irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, + "KILL %s", argv[1]); + } + else + { + irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, + "KILL %s :%s", argv[1], argv_eol[2]); + } return WEECHAT_RC_OK; } @@ -6002,7 +6010,7 @@ irc_command_init () weechat_hook_command ( "kill", N_("close client-server connection"), - N_(" "), + N_(" []"), N_(" nick: nick\n" "reason: reason"), "%(nicks) %-", &irc_command_kill, NULL);