diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | doc/de/includes/autogen_user_commands.de.adoc | 18 | ||||
| -rw-r--r-- | doc/en/includes/autogen_user_commands.en.adoc | 4 | ||||
| -rw-r--r-- | doc/fr/includes/autogen_user_commands.fr.adoc | 4 | ||||
| -rw-r--r-- | doc/it/includes/autogen_user_commands.it.adoc | 4 | ||||
| -rw-r--r-- | doc/ja/includes/autogen_user_commands.ja.adoc | 18 | ||||
| -rw-r--r-- | doc/pl/includes/autogen_user_commands.pl.adoc | 14 | ||||
| -rw-r--r-- | po/cs.po | 23 | ||||
| -rw-r--r-- | po/de.po | 25 | ||||
| -rw-r--r-- | po/es.po | 23 | ||||
| -rw-r--r-- | po/fr.po | 35 | ||||
| -rw-r--r-- | po/hu.po | 23 | ||||
| -rw-r--r-- | po/it.po | 23 | ||||
| -rw-r--r-- | po/ja.po | 25 | ||||
| -rw-r--r-- | po/pl.po | 25 | ||||
| -rw-r--r-- | po/pt.po | 25 | ||||
| -rw-r--r-- | po/pt_BR.po | 19 | ||||
| -rw-r--r-- | po/ru.po | 23 | ||||
| -rw-r--r-- | po/tr.po | 19 | ||||
| -rw-r--r-- | po/weechat.pot | 19 | ||||
| -rw-r--r-- | src/plugins/irc/irc-command.c | 20 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 5 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.h | 3 |
23 files changed, 287 insertions, 111 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 46793aeac..aa243544b 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -35,6 +35,7 @@ New features:: * api: add info "weechat_daemon" * buflist: add option buflist.format.tls_version * fifo: change default value of option fifo.file.path to "${weechat_runtime_dir}/weechat_fifo_${info:pid}" + * irc: add variable "${target}" (target nick) in commands /kick and /kickban * irc: add bar item "tls_version", add options irc.color.item_tls_version_ok, irc.color.item_tls_version_deprecated and irc.color.item_tls_version_insecure (issue #1622) * irc: evaluate server options "sasl_key" and "ssl_cert" * logger: change default value of option logger.file.path to "${weechat_data_dir}/logs" diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc index 8c55357e7..4e5babba6 100644 --- a/doc/de/includes/autogen_user_commands.de.adoc +++ b/doc/de/includes/autogen_user_commands.de.adoc @@ -359,9 +359,9 @@ Beispiele: ---- /kick [<channel>] <nick> [<reason>] -channel: Channelname - nick: Nick der rausgeworfen werden soll - reason: Begründung für den Rauswurf (Variablen die genutzt werden können: $nick, $channel und $server) +channel: channel name + nick: nick + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) ---- [[command_irc_kickban]] @@ -370,14 +370,14 @@ channel: Channelname ---- /kickban [<channel>] <nick> [<reason>] -channel: Channelname - nick: Nickname der rausgeworfen und gebannt werden soll - reason: Begründung weshalb der User rausgeworfen wurde (Variablen die genutzt werden können: $nick, $channel und $server) +channel: channel name + nick: nick + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) -Es ist möglich kick/ban mittels einer Maske auszuführen. Der Nick wird aus der Maske heraus gefiltert und durch "*" ersetzt. +It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*". -Beispiel: - sperre "*!*@host.com" und kicke dann "toto": +Example: + ban "*!*@host.com" and then kick "toto": /kickban toto!*@host.com ---- diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc index d1a3b347e..6017578bd 100644 --- a/doc/en/includes/autogen_user_commands.en.adoc +++ b/doc/en/includes/autogen_user_commands.en.adoc @@ -361,7 +361,7 @@ Examples: channel: channel name nick: nick - reason: reason (special variables $nick, $channel and $server are replaced by their value) + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) ---- [[command_irc_kickban]] @@ -372,7 +372,7 @@ channel: channel name channel: channel name nick: nick - reason: reason (special variables $nick, $channel and $server are replaced by their value) + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*". diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc index 1336a3fc3..cda3cc26a 100644 --- a/doc/fr/includes/autogen_user_commands.fr.adoc +++ b/doc/fr/includes/autogen_user_commands.fr.adoc @@ -361,7 +361,7 @@ Exemples : canal : nom du canal pseudo : pseudo -raison : raison (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur) +raison : raison (évaluée, voir /help eval ; les variables spéciales ${nick} (propre pseudo), ${target} (pseudo cible), ${channel} et ${server} sont remplacées par leur valeurs) ---- [[command_irc_kickban]] @@ -372,7 +372,7 @@ raison : raison (les variables spéciales $nick, $channel et $server sont rempl canal : nom du canal pseudo : pseudo -raison : raison (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur) +raison : raison (évaluée, voir /help eval ; les variables spéciales ${nick} (propre pseudo), ${target} (pseudo cible), ${channel} et ${server} sont remplacées par leur valeurs) Il est possible d'éjecter/bannir avec un masque, le pseudo sera extrait du masque et remplacé par "*". diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc index d89088c2d..93e11095f 100644 --- a/doc/it/includes/autogen_user_commands.it.adoc +++ b/doc/it/includes/autogen_user_commands.it.adoc @@ -361,7 +361,7 @@ Examples: channel: channel name nick: nick - reason: reason (special variables $nick, $channel and $server are replaced by their value) + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) ---- [[command_irc_kickban]] @@ -372,7 +372,7 @@ channel: channel name channel: channel name nick: nick - reason: reason (special variables $nick, $channel and $server are replaced by their value) + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*". diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc index b4ef5a867..9748e1774 100644 --- a/doc/ja/includes/autogen_user_commands.ja.adoc +++ b/doc/ja/includes/autogen_user_commands.ja.adoc @@ -359,9 +359,9 @@ Examples: ---- /kick [<channel>] <nick> [<reason>] -channel: チャンネル名 - nick: ニックネーム - reason: 理由 (特殊変数 $nick、$channel、$server はそれぞれの値に置換されます) +channel: channel name + nick: nick + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) ---- [[command_irc_kickban]] @@ -370,14 +370,14 @@ channel: チャンネル名 ---- /kickban [<channel>] <nick> [<reason>] -channel: チャンネル名 - nick: ニックネーム - reason: 理由 (特殊変数 $nick、$channel、$server はそれぞれの値に置換されます) +channel: channel name + nick: nick + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) -キックと参加禁止にマスクを使うことが可能で、"*" のマスク展開後にマッチするニックネームがこれらの対象になります。 +It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*". -例: - "*!*@host.com" を参加禁止して "toto" をキック: +Example: + ban "*!*@host.com" and then kick "toto": /kickban toto!*@host.com ---- diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc index d91d4dacd..8aef395a5 100644 --- a/doc/pl/includes/autogen_user_commands.pl.adoc +++ b/doc/pl/includes/autogen_user_commands.pl.adoc @@ -359,9 +359,9 @@ Przykłady: ---- /kick [<kanał>] <nick> [<powód>] -kanał: nazwa kanału +channel: channel name nick: nick - powód: powód(specjalne zmienne jak $nick, $channel i $server są podmieniane na odpowiednie wartości) + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) ---- [[command_irc_kickban]] @@ -370,14 +370,14 @@ kanał: nazwa kanału ---- /kickban [<kanał>] <nick> [<powód>] -kanał: nazwa kanału +channel: channel name nick: nick - powód: powód (specjalne zmienne jak $nick, $channel i $server są podmieniane na odpowiednie wartości) + reason: reason (evaluated, see /help eval; special variables ${nick} (self nick), ${target} (target nick), ${channel} and ${server} are replaced by their values) -Możliwe jest kopanie/banowanie za pomocą maski, nick zostanie wyciągnięty z maski i zastąpiony "*". +It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*". -Przykład: - zbanuje "*!*@host.com", następnie wykopie "toto": +Example: + ban "*!*@host.com" and then kick "toto": /kickban toto!*@host.com ---- @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7014,8 +7014,9 @@ msgstr "[<kanál>] <přezdívka> [<důvod>]" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" " kanál: kanál na kterém je uživatel\n" "přezdívka: přezdívka, kterou vykopnout\n" @@ -7028,8 +7029,9 @@ msgstr "vyhodit uživatele z kanálu ven a zakázat hosta" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -7431,6 +7433,17 @@ msgstr "volba: extra volba pro některé servery" msgid "force a user to leave a channel" msgstr "přinutit uživatele opustit kanál" +#, fuzzy +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +" kanál: kanál na kterém je uživatel\n" +"přezdívka: přezdívka, kterou vykopnout\n" +" důvod: důvod pro vykopnutí" + msgid "tell the server to restart itself" msgstr "říct serveru, aby se restartoval" @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-28 09:29+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -8758,11 +8758,13 @@ msgstr "wirft einen User aus einem Channel" msgid "[<channel>] <nick> [<reason>]" msgstr "[<channel>] <nick> [<reason>]" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" "channel: Channelname\n" " nick: Nick der rausgeworfen werden soll\n" @@ -8773,11 +8775,13 @@ msgid "kick a user out of a channel and ban the host" msgstr "" "wirft einen User aus einem Channel und sein Host kommt auf die Bannliste" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -9199,6 +9203,17 @@ msgstr "" msgid "force a user to leave a channel" msgstr "zwingt einen User einen Channel zu verlassen" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +"channel: Channelname\n" +" nick: Nick der rausgeworfen werden soll\n" +" reason: Begründung für den Rauswurf (Variablen die genutzt werden können: " +"$nick, $channel und $server)" + msgid "tell the server to restart itself" msgstr "Server dazu bringen sich selbst neu zu starten" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7233,8 +7233,9 @@ msgstr "[<canal>] <apodo> [<razón>]" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" "canal: canal donde está el usuario\n" "apodo: usuario a expulsar\n" @@ -7248,8 +7249,9 @@ msgstr "fuerza al usuario a abandonar el canal o canales" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -7658,6 +7660,17 @@ msgstr "opción: opción extra, para algunos servidores" msgid "force a user to leave a channel" msgstr "fuerza al usuario a abandonar el canal o canales" +#, fuzzy +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +"canal: canal donde está el usuario\n" +"apodo: usuario a expulsar\n" +"razón: razón de la expulsión" + msgid "tell the server to restart itself" msgstr "pedir al servidor que se reinicie" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" -"PO-Revision-Date: 2021-05-27 18:17+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" +"PO-Revision-Date: 2021-05-29 14:25+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -8588,13 +8588,15 @@ msgstr "[<canal>] <pseudo> [<raison>]" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" " canal : nom du canal\n" "pseudo : pseudo\n" -"raison : raison (les variables spéciales $nick, $channel et $server sont " -"remplacées par leur valeur)" +"raison : raison (évaluée, voir /help eval ; les variables spéciales ${nick} " +"(propre pseudo), ${target} (pseudo cible), ${channel} et ${server} sont " +"remplacées par leur valeurs)" msgid "kick a user out of a channel and ban the host" msgstr "éjecter un utilisateur d'un canal et bannir l'hôte" @@ -8602,8 +8604,9 @@ msgstr "éjecter un utilisateur d'un canal et bannir l'hôte" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -8614,8 +8617,9 @@ msgid "" msgstr "" " canal : nom du canal\n" "pseudo : pseudo\n" -"raison : raison (les variables spéciales $nick, $channel et $server sont " -"remplacées par leur valeur)\n" +"raison : raison (évaluée, voir /help eval ; les variables spéciales ${nick} " +"(propre pseudo), ${target} (pseudo cible), ${channel} et ${server} sont " +"remplacées par leur valeurs)\n" "\n" "Il est possible d'éjecter/bannir avec un masque, le pseudo sera extrait du " "masque et remplacé par \"*\".\n" @@ -9023,6 +9027,17 @@ msgstr "option : option supplémentaire, pour certains serveurs" msgid "force a user to leave a channel" msgstr "forcer un utilisateur à quitter un canal" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +" canal : nom du canal\n" +"pseudo : pseudo\n" +"raison : raison (les variables spéciales $nick, $channel et $server sont " +"remplacées par leur valeur)" + msgid "tell the server to restart itself" msgstr "demander au serveur de redémarrer" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6577,8 +6577,9 @@ msgstr "[szoba] név [megjegyzés]" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" " szoba: a szoba, ahol a felhasználó tartózkodik\n" " név: a kirúgandó neve\n" @@ -6592,8 +6593,9 @@ msgstr "felhasználó erőszakos eltávolítása a szobából" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -6982,6 +6984,17 @@ msgstr "" msgid "force a user to leave a channel" msgstr "felhasználó erőszakos eltávolítása a szobából" +#, fuzzy +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +" szoba: a szoba, ahol a felhasználó tartózkodik\n" +" név: a kirúgandó neve\n" +"megjegyzés: megjegyzés a kirúgáshoz" + msgid "tell the server to restart itself" msgstr "szerver újraindítása" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7369,8 +7369,9 @@ msgstr "[<canale>] <nick> [<motivo>]" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" "canale: canale dove si trova l'utente\n" " nick: nick da cacciare\n" @@ -7384,8 +7385,9 @@ msgstr "forza un utente a lasciare uno o più canali" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -7795,6 +7797,17 @@ msgstr "opzione: opzione extra, per alcuni server" msgid "force a user to leave a channel" msgstr "forza un utente a lasciare uno o più canali" +#, fuzzy +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +"canale: canale dove si trova l'utente\n" +" nick: nick da cacciare\n" +"motivo: motivo per il kick" + msgid "tell the server to restart itself" msgstr "chiede al server di riavviarsi" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -8165,11 +8165,13 @@ msgstr "チャンネルからユーザをキック" msgid "[<channel>] <nick> [<reason>]" msgstr "[<channel>] <nick> [<reason>]" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" "channel: チャンネル名\n" " nick: ニックネーム\n" @@ -8179,11 +8181,13 @@ msgstr "" msgid "kick a user out of a channel and ban the host" msgstr "チャンネルからユーザをキック、そのホストを参加禁止に" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -8595,6 +8599,17 @@ msgstr "option: 追加オプション、いくつかのサーバ用" msgid "force a user to leave a channel" msgstr "ユーザがチャンネルから退出することを強制" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +"channel: チャンネル名\n" +" nick: ニックネーム\n" +" reason: 理由 (特殊変数 $nick、$channel、$server はそれぞれの値に置換されま" +"す)" + msgid "tell the server to restart itself" msgstr "サーバに再起動を指示" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -8379,11 +8379,13 @@ msgstr "wyrzuca użytkownika z kanału" msgid "[<channel>] <nick> [<reason>]" msgstr "[<kanał>] <nick> [<powód>]" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" "kanał: nazwa kanału\n" " nick: nick\n" @@ -8393,11 +8395,13 @@ msgstr "" msgid "kick a user out of a channel and ban the host" msgstr "wyrzuca użytkownika z kanału i banuje hosta" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -8812,6 +8816,17 @@ msgstr "opcje: dodatkowe opcje, dla niektórych serwerów" msgid "force a user to leave a channel" msgstr "zmusza użytkownika do opuszczenia kanału" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +"kanał: nazwa kanału\n" +" nick: nick\n" +" powód: powód(specjalne zmienne jak $nick, $channel i $server są podmieniane " +"na odpowiednie wartości)" + msgid "tell the server to restart itself" msgstr "mówi serwerowi, aby się ponownie uruchomił" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -7935,11 +7935,13 @@ msgstr "expulsar um utilizador do canal" msgid "[<channel>] <nick> [<reason>]" msgstr "[<canal>] <nick> [<razão>]" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" "canal: nome do canal\n" " nick: nick\n" @@ -7949,11 +7951,13 @@ msgstr "" msgid "kick a user out of a channel and ban the host" msgstr "expulsar um utilizador de um canal e banir o host" +#, fuzzy msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -8377,6 +8381,17 @@ msgstr "opção: opção extra, para alguns servidores" msgid "force a user to leave a channel" msgstr "forçar um utilizador a sair de um canal" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +"canal: nome do canal\n" +" nick: nick\n" +"razão: razão (as variáveis especiais $nick, $channel e $server são " +"substituídas pelos respetivos valores)" + msgid "tell the server to restart itself" msgstr "pedir ao servidor para se reiniciar" diff --git a/po/pt_BR.po b/po/pt_BR.po index f44af18f6..4c32174ce 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: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7188,8 +7188,9 @@ msgstr "" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" #, fuzzy @@ -7199,8 +7200,9 @@ msgstr "forçar um usuário a deixar algum(s) canal(is)" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -7523,6 +7525,13 @@ msgstr "opção: opção extra, para alguns servidores" msgid "force a user to leave a channel" msgstr "forçar um usuário a deixar algum(s) canal(is)" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" + msgid "tell the server to restart itself" msgstr "requisitar ao servidor para reiniciar a si mesmo" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6617,8 +6617,9 @@ msgstr "[канал] ник [комментарий]" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" " канал: канал, на котором присутствует пользователь\n" " ник: цель для кика\n" @@ -6632,8 +6633,9 @@ msgstr "принудительно удалить пользователя с к msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -7019,6 +7021,17 @@ msgstr "" msgid "force a user to leave a channel" msgstr "принудительно удалить пользователя с канала" +#, fuzzy +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" +" канал: канал, на котором присутствует пользователь\n" +" ник: цель для кика\n" +"комментарий: причина кика" + msgid "tell the server to restart itself" msgstr "перезагрузить сервер" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+0200\n" "PO-Revision-Date: 2021-05-25 18:28+0200\n" "Last-Translator: Emir SARI <bitigchi@me.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6507,8 +6507,9 @@ msgstr "" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" msgid "kick a user out of a channel and ban the host" @@ -6517,8 +6518,9 @@ msgstr "" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -6822,6 +6824,13 @@ msgstr "" msgid "force a user to leave a channel" msgstr "" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" + msgid "tell the server to restart itself" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 8248657db..d485bba28 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: 2021-05-27 18:15+0200\n" +"POT-Creation-Date: 2021-05-29 14:23+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" @@ -6005,8 +6005,9 @@ msgstr "" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)" msgstr "" msgid "kick a user out of a channel and ban the host" @@ -6015,8 +6016,9 @@ msgstr "" msgid "" "channel: channel name\n" " nick: nick\n" -" reason: reason (special variables $nick, $channel and $server are replaced " -"by their value)\n" +" reason: reason (evaluated, see /help eval; special variables ${nick} (self " +"nick), ${target} (target nick), ${channel} and ${server} are replaced by " +"their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from mask and " "replaced by \"*\".\n" @@ -6314,6 +6316,13 @@ msgstr "" msgid "force a user to leave a channel" msgstr "" +msgid "" +"channel: channel name\n" +" nick: nick\n" +" reason: reason (special variables $nick, $channel and $server are replaced " +"by their value)" +msgstr "" + msgid "tell the server to restart itself" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index f28fa12f8..7728fbb09 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -1755,7 +1755,8 @@ IRC_COMMAND_CALLBACK(cycle) IRC_SERVER_OPTION_MSG_PART); if (ptr_arg && ptr_arg[0]) { - msg = irc_server_get_default_msg (ptr_arg, ptr_server, channel_name); + msg = irc_server_get_default_msg (ptr_arg, ptr_server, channel_name, + NULL); irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, "PART %s :%s", channel_name, msg); } @@ -2033,7 +2034,7 @@ irc_command_quit_server (struct t_irc_server *server, const char *arguments) IRC_SERVER_OPTION_MSG_QUIT); if (ptr_arg && ptr_arg[0]) { - msg = irc_server_get_default_msg (ptr_arg, server, NULL); + msg = irc_server_get_default_msg (ptr_arg, server, NULL, NULL); irc_server_sendf (server, 0, NULL, "QUIT :%s", msg); } else @@ -2775,7 +2776,8 @@ irc_command_kick_channel (struct t_irc_server *server, IRC_SERVER_OPTION_MSG_KICK); if (ptr_msg && ptr_msg[0]) { - msg = irc_server_get_default_msg (ptr_msg, server, channel_name); + msg = irc_server_get_default_msg (ptr_msg, server, channel_name, + nick_name); irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, "KICK %s %s :%s", channel_name, nick_name, msg); @@ -3942,7 +3944,7 @@ irc_command_part_channel (struct t_irc_server *server, const char *channel_name, IRC_SERVER_OPTION_MSG_PART); if (ptr_arg && ptr_arg[0]) { - msg = irc_server_get_default_msg (ptr_arg, server, channel_name); + msg = irc_server_get_default_msg (ptr_arg, server, channel_name, NULL); irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, "PART %s :%s", channel_name, msg); } @@ -6694,8 +6696,9 @@ irc_command_init () N_("[<channel>] <nick> [<reason>]"), N_("channel: channel name\n" " nick: nick\n" - " reason: reason (special variables $nick, $channel and $server are " - "replaced by their value)"), + " reason: reason (evaluated, see /help eval; special variables " + "${nick} (self nick), ${target} (target nick), ${channel} and " + "${server} are replaced by their values)"), "%(nicks) %(irc_msg_kick) %-", &irc_command_kick, NULL, NULL); weechat_hook_command ( "kickban", @@ -6703,8 +6706,9 @@ irc_command_init () N_("[<channel>] <nick> [<reason>]"), N_("channel: channel name\n" " nick: nick\n" - " reason: reason (special variables $nick, $channel and $server are " - "replaced by their value)\n" + " reason: reason (evaluated, see /help eval; special variables " + "${nick} (self nick), ${target} (target nick), ${channel} and " + "${server} are replaced by their values)\n" "\n" "It is possible to kick/ban with a mask, nick will be extracted from " "mask and replaced by \"*\".\n" diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 44293fba9..b754ec3e3 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -1361,7 +1361,8 @@ irc_server_get_max_modes (struct t_irc_server *server) char * irc_server_get_default_msg (const char *default_msg, struct t_irc_server *server, - const char *channel_name) + const char *channel_name, + const char *target_nick) { char *version; struct t_hashtable *extra_vars; @@ -1393,6 +1394,8 @@ irc_server_get_default_msg (const char *default_msg, weechat_hashtable_set (extra_vars, "channel", (channel_name) ? channel_name : ""); weechat_hashtable_set (extra_vars, "nick", server->nick); + if (target_nick) + weechat_hashtable_set (extra_vars, "target", target_nick); } msg = weechat_string_eval_expression (default_msg, NULL, extra_vars, NULL); diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index 535b61c90..e5bb74578 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -340,7 +340,8 @@ extern int irc_server_prefix_char_statusmsg (struct t_irc_server *server, extern int irc_server_get_max_modes (struct t_irc_server *server); extern char *irc_server_get_default_msg (const char *default_msg, struct t_irc_server *server, - const char *channel_name); + const char *channel_name, + const char *target_nick); extern struct t_irc_server *irc_server_alloc (const char *name); extern struct t_irc_server *irc_server_alloc_with_url (const char *irc_url); extern void irc_server_apply_command_line_options (struct t_irc_server *server, |