diff options
| -rw-r--r-- | ChangeLog.asciidoc | 1 | ||||
| -rw-r--r-- | po/cs.po | 6 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/es.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 10 | ||||
| -rw-r--r-- | po/hu.po | 6 | ||||
| -rw-r--r-- | po/it.po | 7 | ||||
| -rw-r--r-- | po/ja.po | 6 | ||||
| -rw-r--r-- | po/pl.po | 6 | ||||
| -rw-r--r-- | po/pt_BR.po | 6 | ||||
| -rw-r--r-- | po/ru.po | 6 | ||||
| -rw-r--r-- | po/tr.po | 6 | ||||
| -rw-r--r-- | po/weechat.pot | 6 | ||||
| -rw-r--r-- | src/plugins/irc/irc-command.c | 12 |
14 files changed, 77 insertions, 13 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 1b8bbb5fd..fdf64c5ac 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -45,6 +45,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * api: fix type of value returned by function strcasestr * fifo: fix send error on Cygwin when something is received in the pipe (closes #436) +* irc: do not allow command /query with a channel name (closes #459) * irc: decode/encode only text in IRC messages and not the headers (bug #29886, closes #218, closes #451) * irc: fix crash with commands /allchan, /allpv and /allserv if the executed @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-03-21 08:41+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5281,6 +5281,10 @@ msgstr "%s: přidána notifikace pro %s%s" msgid "%s%s: notification not found" msgstr "%s%s: notifikace nenalezena" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s%s: \"%s\" příkaz může být spuštěn pouze v bufferu kanálu" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s: nemohu vytvořít nový soukromý buffer\"%s\"" @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-06-30 21:30+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <>\n" @@ -6231,6 +6231,10 @@ msgstr "%s: Benachrichtigung für %s%s%s gelöscht" msgid "%s%s: notification not found" msgstr "%s%s: Benachrichtigung nicht gefunden" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s%s: Der Befehl \"%s\" kann nur im Channel-Buffer ausgeführt werden" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s: ein neuer privater Buffer \"%s\" kann nicht erstellt werden" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-03-21 08:41+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5507,6 +5507,10 @@ msgstr "%s: notificación para %s%s agregada" msgid "%s%s: notification not found" msgstr "%s%s: notificación no encontrada" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s%s: el comando \"%s\" solo puede ser ejecutado en un canal" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s: no es posible crear la conversación privada \"%s\"" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" -"PO-Revision-Date: 2015-06-30 07:50+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" +"PO-Revision-Date: 2015-07-09 20:34+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -6096,6 +6096,12 @@ msgid "%s%s: notification not found" msgstr "%s%s : notification non trouvée" #, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "" +"%s%s : la commande \"%s\" ne peut pas être exécutée avec un nom de canal " +"(\"%s\")" + +#, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s : impossible de créer le tampon privé \"%s\"" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-03-21 08:41+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4847,6 +4847,10 @@ msgid "%s%s: notification not found" msgstr "aláírás nem található" #, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" + +#, fuzzy, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-03-21 08:41+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5657,6 +5657,11 @@ msgstr "%s: notifica aggiunta per %s%s" msgid "%s%s: notification not found" msgstr "%s%s: notifica non trovata" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "" +"%s%s: il comando \"%s\" può essere eseguito solamente sul buffer del canale" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s: impossibile creare il nuovo buffer privato \"%s\"" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-06-21 22:54+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -5823,6 +5823,10 @@ msgstr "%s: %s%s%s の通知を削除" msgid "%s%s: notification not found" msgstr "%s%s: 通知が見つかりません" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s%s: \"%s\" コマンドはチャンネルバッファ内でのみ実行可能" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s: 新しいプライベートバッファ \"%s\" の作成に失敗" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-05-09 14:00+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5955,6 +5955,10 @@ msgstr "%s: powiadomienie usunięte dla %s%s%s" msgid "%s%s: notification not found" msgstr "%s%s: nie znaleziono powiadomienia" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s%s: komenda \"%s\" może być tylko wykonana w buforze kanału" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s%s: nie można utworzyć nowego bufora prywatnego \"%s\"" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9f077604e..a1699b1b8 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-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-03-21 08:41+0100\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5436,6 +5436,10 @@ msgstr "%s: desconectado do cliente %s%s%s (%s.%s)" msgid "%s%s: notification not found" msgstr "" +#, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s%s: não foi possível criar novo canal \"%s\"" + #, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\n" "PO-Revision-Date: 2015-03-21 08:41+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4882,6 +4882,10 @@ msgid "%s%s: notification not found" msgstr "подпись не найдена" #, fuzzy, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" + +#, fuzzy, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+0200\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" @@ -4432,6 +4432,10 @@ msgid "%s%s: notification not found" msgstr "" #, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "" + +#, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index eac02c5c3..ddfc99a44 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-06-30 07:49+0200\n" +"POT-Creation-Date: 2015-07-09 20:32+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" @@ -4424,6 +4424,10 @@ msgid "%s%s: notification not found" msgstr "" #, c-format +msgid "%s%s: \"%s\" command can not be executed with a channel name (\"%s\")" +msgstr "" + +#, c-format msgid "%s%s: cannot create new private buffer \"%s\"" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index d55a9a3ae..3edb5433a 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -3866,6 +3866,18 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc, for (i = 0; i < num_nicks; i++) { + /* ensure the name is not a channel name */ + if (irc_channel_is_channel (ptr_server, nicks[i])) + { + weechat_printf ( + ptr_server->buffer, + _("%s%s: \"%s\" command can not be executed with a " + "channel name (\"%s\")"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, "query", + nicks[i]); + continue; + } + /* create private window if not already opened */ ptr_channel = irc_channel_search (ptr_server, nicks[i]); if (!ptr_channel) |