summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog.asciidoc1
-rw-r--r--doc/de/autogen/user/irc_commands.asciidoc9
-rw-r--r--doc/en/autogen/user/irc_commands.asciidoc9
-rw-r--r--doc/fr/autogen/user/irc_commands.asciidoc9
-rw-r--r--doc/it/autogen/user/irc_commands.asciidoc9
-rw-r--r--doc/ja/autogen/user/aspell_commands.asciidoc22
-rw-r--r--doc/ja/autogen/user/irc_commands.asciidoc9
-rw-r--r--doc/ja/autogen/user/weechat_options.asciidoc4
-rw-r--r--doc/pl/autogen/user/irc_commands.asciidoc9
-rw-r--r--po/cs.po11
-rw-r--r--po/de.po13
-rw-r--r--po/es.po11
-rw-r--r--po/fr.po22
-rw-r--r--po/hu.po11
-rw-r--r--po/it.po12
-rw-r--r--po/ja.po35
-rw-r--r--po/pl.po13
-rw-r--r--po/pt_BR.po11
-rw-r--r--po/ru.po11
-rw-r--r--po/tr.po12
-rw-r--r--po/weechat.pot11
-rw-r--r--src/plugins/irc/irc-command.c53
22 files changed, 182 insertions, 125 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index c0d0eb8c7..c3233352b 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -27,6 +27,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* core: add option "-s" in command /eval to split expression before evaluating
it (no more split by default) (closes #324)
* core: add priority in plugins to initialize them in order
+* irc: add option "-noswitch" in command /query (closes #394)
* irc: format message 008 (RPL_SNOMASK) (closes #144)
* irc: add support of "account-notify" capability (closes #11, closes #246)
* irc: remove server "freenode" from default config file (closes #309)
diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.asciidoc
index 46230077d..dbbd68d68 100644
--- a/doc/de/autogen/user/irc_commands.asciidoc
+++ b/doc/de/autogen/user/irc_commands.asciidoc
@@ -551,11 +551,12 @@ Daemon2: Nachricht an diesen Daemon weiterleiten
[command]*`query`* Eine private Nachricht an einen Nick schicken::
----
-/query [-server <server>] <nick>[,<nick>...] [<text>]
+/query [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
-server: an diesen Server senden (interner Name)
-target: Nickname
- text: zu sendender Text
+-noswitch: do not switch to new buffer
+ server: send to this server (internal name)
+ nick: nick
+ text: text to send
----
[[command_irc_quiet]]
diff --git a/doc/en/autogen/user/irc_commands.asciidoc b/doc/en/autogen/user/irc_commands.asciidoc
index 8c7257989..4bd603e9c 100644
--- a/doc/en/autogen/user/irc_commands.asciidoc
+++ b/doc/en/autogen/user/irc_commands.asciidoc
@@ -551,11 +551,12 @@ daemon2: forward message to this daemon
[command]*`query`* send a private message to a nick::
----
-/query [-server <server>] <nick>[,<nick>...] [<text>]
+/query [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
-server: send to this server (internal name)
- nick: nick
- text: text to send
+-noswitch: do not switch to new buffer
+ server: send to this server (internal name)
+ nick: nick
+ text: text to send
----
[[command_irc_quiet]]
diff --git a/doc/fr/autogen/user/irc_commands.asciidoc b/doc/fr/autogen/user/irc_commands.asciidoc
index 1e1f8b177..11aa61316 100644
--- a/doc/fr/autogen/user/irc_commands.asciidoc
+++ b/doc/fr/autogen/user/irc_commands.asciidoc
@@ -551,11 +551,12 @@ démon2 : faire suivre le message à ce démon
[command]*`query`* envoyer un message privé à un pseudo::
----
-/query [-server <serveur>] <pseudo>[,<pseudo>...] [<texte>]
+/query [-noswitch] [-server <serveur>] <pseudo>[,<pseudo>...] [<texte>]
-serveur : envoyer à ce serveur (nom interne)
- pseudo : pseudo
- texte : texte à envoyer
+-noswitch : ne pas basculer sur le nouveau tampon
+ serveur : envoyer à ce serveur (nom interne)
+ pseudo : pseudo
+ texte : texte à envoyer
----
[[command_irc_quiet]]
diff --git a/doc/it/autogen/user/irc_commands.asciidoc b/doc/it/autogen/user/irc_commands.asciidoc
index f1a94437e..30a21b7bb 100644
--- a/doc/it/autogen/user/irc_commands.asciidoc
+++ b/doc/it/autogen/user/irc_commands.asciidoc
@@ -551,11 +551,12 @@ demone2: reindirizza messaggio a questo demone
[command]*`query`* invia un messaggio privato ad un nick::
----
-/query [-server <server>] <nick>[,<nick>...] [<testo>]
+/query [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
-server: send to this server (internal name)
- nick: nick
- text: text to send
+-noswitch: do not switch to new buffer
+ server: send to this server (internal name)
+ nick: nick
+ text: text to send
----
[[command_irc_quiet]]
diff --git a/doc/ja/autogen/user/aspell_commands.asciidoc b/doc/ja/autogen/user/aspell_commands.asciidoc
index 948181432..59499f49f 100644
--- a/doc/ja/autogen/user/aspell_commands.asciidoc
+++ b/doc/ja/autogen/user/aspell_commands.asciidoc
@@ -12,22 +12,22 @@
deldict
addword [<dict>] <word>
- enable: enable aspell
- disable: disable aspell
- toggle: toggle aspell
-listdict: show installed dictionaries
- setdict: set dictionary for current buffer (multiple dictionaries can be separated by a comma)
- deldict: delete dictionary used on current buffer
- addword: add a word in personal aspell dictionary
+ enable: aspell の有効化
+ disable: aspell の無効化
+ toggle: aspell の有効無効を切り替え
+listdict: インストール済み辞書を表示
+ setdict: 現在のバッファ用の辞書を設定 (コンマで区切れば複数の辞書を指定可能)
+ deldict: 現在のバッファ用の辞書を削除
+ addword: aspell の個人辞書に単語を追加
-Input line beginning with a '/' is not checked, except for some commands (see /set aspell.check.commands).
+いくつかのコマンドを除いて '/' で始まる入力行はチェックされません (/set aspell.check.commands を参照)。
-To enable aspell on all buffers, use option "default_dict", then enable aspell, for example:
+全てのバッファで aspell を有効化するには、"default_dict" オプションを設定した後に、aspell を有効化してください。例:
/set aspell.check.default_dict "en"
/aspell enable
-To display a list of suggestions in a bar, use item "aspell_suggest".
+バーの中に提案のリストを表示するには、"aspell_suggest" アイテムを使ってください。
-Default key to toggle aspell is alt-s.
+aspell の有効無効を切り替えるデフォルトのキーは alt-s です。
----
diff --git a/doc/ja/autogen/user/irc_commands.asciidoc b/doc/ja/autogen/user/irc_commands.asciidoc
index 562665931..8543b5b0c 100644
--- a/doc/ja/autogen/user/irc_commands.asciidoc
+++ b/doc/ja/autogen/user/irc_commands.asciidoc
@@ -551,11 +551,12 @@ daemon2: メッセージをデーモンに転送
[command]*`query`* ニックネーム宛にプライベートメッセージを送信::
----
-/query [-server <server>] <nick>[,<nick>...] [<text>]
+/query [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
-server: このサーバに送信 (内部サーバ名)
-target: ニックネーム
- text: 送信するテキスト
+-noswitch: do not switch to new buffer
+ server: send to this server (internal name)
+ nick: nick
+ text: text to send
----
[[command_irc_quiet]]
diff --git a/doc/ja/autogen/user/weechat_options.asciidoc b/doc/ja/autogen/user/weechat_options.asciidoc
index 819f68222..97f81f03f 100644
--- a/doc/ja/autogen/user/weechat_options.asciidoc
+++ b/doc/ja/autogen/user/weechat_options.asciidoc
@@ -913,12 +913,12 @@
** 値: 未制約文字列 (デフォルト値: `"WeeChat ${info:version}"`)
* [[option_weechat.look.word_chars_highlight]] *weechat.look.word_chars_highlight*
-** 説明: `comma-separated list of chars (or range of chars) that are considered part or words for highlights; each item can be a single char, a range of chars (format: a-z), a class of wide character (for example "alnum", see man wctype); a "!" before the item makes it negative (ie the char is NOT considered part of words); the value "*" matches any char; unicode chars are allowed with the format \u1234, for example \u00A0 for unbreakable space (see /help print for supported formats)`
+** 説明: `ハイライトする部分または文字と見なす文字 (または文字範囲) のカンマ区切りリスト; それぞれの要素は単一文字、文字範囲 (フォーマット: a-z)、全角文字のクラス (例えば "alnum"、wctype の man 参照); 要素の前の "!" は否定を意味します (この文字は単語の一部とみなされません); "*" は任意の文字にマッチします; unicode 文字はフォーマット \u1234 で使うことができます、例えば \u00A0 は固定スペースを意味します (サポートされるフォーマットは /help print を参照)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"!\u00A0,-,_,|,alnum"`)
* [[option_weechat.look.word_chars_input]] *weechat.look.word_chars_input*
-** 説明: `comma-separated list of chars (or range of chars) that are considered part or words for command line; each item can be a single char, a range of chars (format: a-z), a class of wide character (for example "alnum", see man wctype); a "!" before the item makes it negative (ie the char is NOT considered part of words); the value "*" matches any char; unicode chars are allowed with the format \u1234, for example \u00A0 for unbreakable space (see /help print for supported formats)`
+** 説明: `コマンドラインの一部または単語と見なす文字 (または文字範囲) のカンマ区切りリスト; それぞれの要素は単一文字、文字範囲 (フォーマット: a-z)、全角文字のクラス (例えば "alnum"、wctype の man 参照); 要素の前の "!" は否定を意味します (この文字は単語の一部とみなされません); "*" は任意の文字にマッチします; unicode 文字はフォーマット \u1234 で使うことができます、例えば \u00A0 は固定スペースを意味します (サポートされるフォーマットは /help print を参照)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"!\u00A0,-,_,|,alnum"`)
diff --git a/doc/pl/autogen/user/irc_commands.asciidoc b/doc/pl/autogen/user/irc_commands.asciidoc
index 40d61bc51..d997a1764 100644
--- a/doc/pl/autogen/user/irc_commands.asciidoc
+++ b/doc/pl/autogen/user/irc_commands.asciidoc
@@ -551,11 +551,12 @@ demon2: prześlij do tego demona
[command]*`query`* wysyła prywatną wiadomość do użytkownika::
----
-/query [-server <serwer>] <nick>[,<nick>...] [<tekst>]
+/query [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
-serwer: wyślij do tego serwera (nazwa wewnętrzna)
- nick: nick
- tekst: wiadomość do wysłania
+-noswitch: do not switch to new buffer
+ server: send to this server (internal name)
+ nick: nick
+ text: text to send
----
[[command_irc_quiet]]
diff --git a/po/cs.po b/po/cs.po
index 8b5480a7c..dc83a28a8 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: 2015-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -6136,14 +6136,15 @@ msgid "send a private message to a nick"
msgstr "poslat soukromou zprávu přezdívce"
#, fuzzy
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <přezdívka> [<text>]"
#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
" server: poslat tomuto serveru (vnitřní jméno)\n"
"příjemce: přezdívka nebo kanál\n"
diff --git a/po/de.po b/po/de.po
index 23351a83c..d45d8568b 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+0200\n"
"PO-Revision-Date: 2015-03-31 09:13+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <>\n"
@@ -7054,13 +7054,16 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "Eine private Nachricht an einen Nick schicken"
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
"server: an diesen Server senden (interner Name)\n"
"target: Nickname\n"
diff --git a/po/es.po b/po/es.po
index 942941b52..6c7c98275 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -6374,14 +6374,15 @@ msgid "send a private message to a nick"
msgstr "enviar mensaje privado a un usuario"
#, fuzzy
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <servidor>] <apodo> [<texto>]"
#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
"servidor: enviar a este servidor (nombre interno)\n"
" destino: apodo o canal\n"
diff --git a/po/fr.po b/po/fr.po
index cd80d989c..6c4eaa35e 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-04-11 18:55+0200\n"
-"PO-Revision-Date: 2015-04-12 08:53+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+0200\n"
+"PO-Revision-Date: 2015-04-14 07:36+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -6924,17 +6924,19 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "envoyer un message privé à un pseudo"
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
-msgstr "[-server <serveur>] <pseudo>[,<pseudo>...] [<texte>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
+msgstr "[-noswitch] [-server <serveur>] <pseudo>[,<pseudo>...] [<texte>]"
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
-"serveur : envoyer à ce serveur (nom interne)\n"
-" pseudo : pseudo\n"
-" texte : texte à envoyer"
+"-noswitch : ne pas basculer sur le nouveau tampon\n"
+" serveur : envoyer à ce serveur (nom interne)\n"
+" pseudo : pseudo\n"
+" texte : texte à envoyer"
msgid "quiet nicks or hosts"
msgstr "faire taire des pseudos ou hôtes"
diff --git a/po/hu.po b/po/hu.po
index 7cdc8ee7c..aabf4c95a 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -5597,14 +5597,15 @@ msgid "send a private message to a nick"
msgstr "személyes üzenet küldése egy felhasználónak"
#, fuzzy
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[szerver | név]"
#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
"fogadó: név vagy szoba (esetleg maszk, '*' = aktuális szoba)\n"
"szöveg: küldendő üzenet"
diff --git a/po/it.po b/po/it.po
index 5bfe78a80..3c1eef652 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -6516,14 +6516,16 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "invia un messaggio privato ad un nick"
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick>[,<nick>...] [<testo>]"
#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
" server: invia a questo server (nome interno)\n"
"destinazione: nick o canale\n"
diff --git a/po/ja.po b/po/ja.po
index 0484d3fb3..a438f27b4 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+0200\n"
"PO-Revision-Date: 2015-04-13 00:40+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -40,11 +40,11 @@ msgid "max chars"
msgstr "最大文字数"
msgid ""
-"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)"
-"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal "
-"color number or an alias; attributes are allowed before color (for text "
-"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for "
-"italic, \"_\" for underline"
+"a WeeChat color name (default, black, (dark)gray, white, (light)red, "
+"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a "
+"terminal color number or an alias; attributes are allowed before color (for "
+"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" "
+"for italic, \"_\" for underline"
msgstr ""
"WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、"
"brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま"
@@ -6023,8 +6023,8 @@ msgstr ""
" - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n"
" - ホスト名/ポート番号又は IP アドレス/ポート番号、デフォルトの"
"ポート番号は 6667\n"
-" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]"
-"irc.example.org[:port][/#channel1][,#channel2[...]]\n"
+" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:"
+"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n"
" 注意: アドレス/IP/URL を指定した場合、サーバを一時的に作ります "
"(保存しません)、/help irc.look.temporary_servers を参照してください。\n"
" option: サーバに関するオプション (ブール型オプションでは、value は無視さ"
@@ -6638,13 +6638,16 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "ニックネーム宛にプライベートメッセージを送信"
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
"server: このサーバに送信 (内部サーバ名)\n"
"target: ニックネーム\n"
@@ -11065,8 +11068,8 @@ msgid ""
"Examples (you can also look at default triggers with /trigger listdefault):\n"
" add text attributes *bold*, _underline_ and /italic/ (only in user "
"messages):\n"
-" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*"
-"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
+" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"=="
+"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
"underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:"
"italic}${re:1}${color:-italic}/\"\n"
" hide nicklist bar on small terminals:\n"
@@ -11142,8 +11145,8 @@ msgstr ""
"\n"
"例 (/trigger listdefault でデフォルトトリガを見ることができます):\n"
" テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):\n"
-" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*"
-"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
+" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"=="
+"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
"underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:"
"italic}${re:1}${color:-italic}/\"\n"
" 狭い端末ではニックネームリストバーを隠す:\n"
diff --git a/po/pl.po b/po/pl.po
index cdb7f1c98..80dd73d3f 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6764,13 +6764,16 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "wysyła prywatną wiadomość do użytkownika"
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <serwer>] <nick>[,<nick>...] [<tekst>]"
+#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
"serwer: wyślij do tego serwera (nazwa wewnętrzna)\n"
" nick: nick\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e049191e2..0f53be972 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -6076,13 +6076,14 @@ msgid "send a private message to a nick"
msgstr "enviar mensagem privada a um nick"
#, fuzzy
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick>[,<nick>...] [<text>]"
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
#, fuzzy
diff --git a/po/ru.po b/po/ru.po
index d028a7c14..b5987ceec 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -5631,14 +5631,15 @@ msgid "send a private message to a nick"
msgstr "отправить личное сообщение нику"
#, fuzzy
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[сервер | ник]"
#, fuzzy
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
"адресат: ник или канал (можно использовать маску, '*' = текущий канал)\n"
"текст: отправляаемый текст"
diff --git a/po/tr.po b/po/tr.po
index 5e74462c1..1d624d9cd 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17:19+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"
@@ -5049,13 +5049,15 @@ msgstr ""
msgid "send a private message to a nick"
msgstr ""
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+#, fuzzy
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <sunucu>] <rumuz>[,<rumuz>...] [<metin>]"
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
msgid "quiet nicks or hosts"
diff --git a/po/weechat.pot b/po/weechat.pot
index f280abc72..7f25aca0e 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-04-11 18:55+0200\n"
+"POT-Creation-Date: 2015-04-13 17: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"
@@ -5031,13 +5031,14 @@ msgstr ""
msgid "send a private message to a nick"
msgstr ""
-msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
msgstr ""
msgid ""
-"server: send to this server (internal name)\n"
-" nick: nick\n"
-" text: text to send"
+"-noswitch: do not switch to new buffer\n"
+" server: send to this server (internal name)\n"
+" nick: nick\n"
+" text: text to send"
msgstr ""
msgid "quiet nicks or hosts"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 7c132e410..0a87afdf2 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -3754,7 +3754,7 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *string, **nicks;
- int i, arg_nick, arg_text, num_nicks;
+ int i, arg_nick, arg_text, num_nicks, noswitch;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
@@ -3763,15 +3763,40 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
WEECHAT_COMMAND_MIN_ARGS(2, "");
+ noswitch = 0;
arg_nick = 1;
arg_text = 2;
- if ((argc >= 4) && (weechat_strcasecmp (argv[1], "-server") == 0))
+
+ for (i = 1; i < argc; i++)
{
- ptr_server = irc_server_search (argv[2]);
- arg_nick = 3;
- arg_text = 4;
+ if (weechat_strcasecmp (argv[i], "-server") == 0)
+ {
+ if (argc <= i + 1)
+ WEECHAT_COMMAND_ERROR;
+ ptr_server = irc_server_search (argv[i + 1]);
+ if (!ptr_server)
+ WEECHAT_COMMAND_ERROR;
+ arg_nick = i + 2;
+ arg_text = i + 3;
+ i++;
+ }
+ else if (weechat_strcasecmp (argv[i], "-noswitch") == 0)
+ {
+ noswitch = 1;
+ arg_nick = i + 1;
+ arg_text = i + 2;
+ }
+ else
+ {
+ arg_nick = i;
+ arg_text = i + 1;
+ break;
+ }
}
+ if (arg_nick >= argc)
+ WEECHAT_COMMAND_ERROR;
+
IRC_COMMAND_CHECK_SERVER("query", 1);
nicks = weechat_string_split (argv[arg_nick], ",", 0, 0, &num_nicks);
@@ -3786,7 +3811,9 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
{
ptr_channel = irc_channel_new (ptr_server,
IRC_CHANNEL_TYPE_PRIVATE,
- nicks[i], 1, 0);
+ nicks[i],
+ (noswitch) ? 0 : 1,
+ 0);
if (!ptr_channel)
{
weechat_printf (
@@ -3799,7 +3826,8 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
if (ptr_channel)
{
/* switch to buffer */
- weechat_buffer_set (ptr_channel->buffer, "display", "1");
+ if (!noswitch)
+ weechat_buffer_set (ptr_channel->buffer, "display", "1");
/* display text if given */
if (argv_eol[arg_text])
@@ -6395,11 +6423,12 @@ irc_command_init ()
weechat_hook_command (
"query",
N_("send a private message to a nick"),
- N_("[-server <server>] <nick>[,<nick>...] [<text>]"),
- N_("server: send to this server (internal name)\n"
- " nick: nick\n"
- " text: text to send"),
- "-server %(irc_servers) %(nicks)"
+ N_("[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"),
+ N_("-noswitch: do not switch to new buffer\n"
+ " server: send to this server (internal name)\n"
+ " nick: nick\n"
+ " text: text to send"),
+ "-noswitch|-server %(irc_servers) %(nicks)"
" || %(nicks)",
&irc_command_query, NULL);
weechat_hook_command (
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 05:26:02 +0000