diff --git a/ChangeLog b/ChangeLog index f9786aeca..90bb2470d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,8 @@ Version 0.4.0 (under dev!) hook_connect, move "sock" from hook_connect arguments to callback of hook_connect (task #11205) * aspell: add bar item "aspell_dict" (dictionary used on current buffer) +* irc: add command /quiet, fix display of messages 728/729 (quiet list, end of + quiet list) (task #12278) * irc: add option irc.network.alternate_nick to disable dynamic nick generation when all nicks are already in use on server (task #12281) * irc: add option irc.network.whois_double_nick to double nick in command /whois diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt index 9fe26cca1..9ad5c94b8 100644 --- a/doc/de/autogen/user/irc_commands.txt +++ b/doc/de/autogen/user/irc_commands.txt @@ -467,6 +467,17 @@ server: an diesen Server senden (interner Name) text: Text der gesendet werden soll ........................................ +[[command_irc_quiet]] +[command]*`quiet`* quiet nicks or hosts:: +........................................ +/quiet [] [ [...]] + +channel: channel for quiet + nick: user or host to quiet + +Without argument, this command display quiet list for current channel. +........................................ + [[command_irc_quote]] [command]*`quote`* Daten direkt an Server senden (siehe RFC 2812):: ........................................ diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index e6c47ea5d..f54871dfd 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -2082,6 +2082,10 @@ Unvollständige Liste der IRC Nachrichten bzw. Alias die angepasst werden könne | 433 | | Nickname wird schon verwendet | 438 | | nicht autorisiert um Nicknamen zu ändern | 671 | whois | whois (sichere Verbindung) +// TRANSLATION MISSING +| 728 | quietlist | quiet list +// TRANSLATION MISSING +| 729 | quietlist | end of quiet list | 901 | | Sie sind nun eingelogged |======================================== diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt index 496b7e726..74d40cd70 100644 --- a/doc/en/autogen/user/irc_commands.txt +++ b/doc/en/autogen/user/irc_commands.txt @@ -467,6 +467,17 @@ server: send to this server (internal name) text: text to send ........................................ +[[command_irc_quiet]] +[command]*`quiet`* quiet nicks or hosts:: +........................................ +/quiet [] [ [...]] + +channel: channel for quiet + nick: user or host to quiet + +Without argument, this command display quiet list for current channel. +........................................ + [[command_irc_quote]] [command]*`quote`* send raw data to server without parsing:: ........................................ diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index 9da126350..fa108589e 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -2052,6 +2052,8 @@ Non-comprehensive list of IRC messages or alias that you can customize: | 433 | | nickname already in use | 438 | | not authorized to change nickname | 671 | whois | whois (secure connection) +| 728 | quietlist | quiet list +| 729 | quietlist | end of quiet list | 901 | | you are now logged in |======================================== diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt index f48a53cdb..1c2126951 100644 --- a/doc/fr/autogen/user/irc_commands.txt +++ b/doc/fr/autogen/user/irc_commands.txt @@ -467,6 +467,17 @@ serveur: envoyer à ce serveur (nom interne) texte: texte à envoyer ........................................ +[[command_irc_quiet]] +[command]*`quiet`* faire taire des pseudos ou hôtes:: +........................................ +/quiet [] [ [...]] + + canal: nom du canal pour faire taire +pseudo: pseudo ou hôte à faire taire + +Sans paramètre, cette commande affiche la liste des "quiet" pour le canal courant. +........................................ + [[command_irc_quote]] [command]*`quote`* envoyer des données brutes au serveur sans analyse:: ........................................ diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index b54e4c828..a6909a780 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -2115,6 +2115,8 @@ Liste non exhaustive des messages ou alias que vous pouvez paramétrer : | 433 | | pseudo déjà en cours d'utilisation | 438 | | pas autorisé à changer de pseudo | 671 | whois | whois (connexion sécurisée) +| 728 | quietlist | liste des "quiet" +| 729 | quietlist | fin de la liste des "quiet" | 901 | | vous êtes maintenant identifié |======================================== diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt index 1e05c8850..2d3820958 100644 --- a/doc/it/autogen/user/irc_commands.txt +++ b/doc/it/autogen/user/irc_commands.txt @@ -467,6 +467,17 @@ server: invia a questo server (nome interno) testo: testo da inviare ........................................ +[[command_irc_quiet]] +[command]*`quiet`* quiet nicks or hosts:: +........................................ +/quiet [] [ [...]] + +channel: channel for quiet + nick: user or host to quiet + +Without argument, this command display quiet list for current channel. +........................................ + [[command_irc_quote]] [command]*`quote`* invia dati grezzi al server senza analisi:: ........................................ diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index 94f344e4d..22f9fcec5 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -2102,6 +2102,10 @@ personalizzare: | 433 | | nick già utilizzato | 438 | | non autorizzato a cambiare nick | 671 | whois | whois (connessione sicura) +// TRANSLATION MISSING +| 728 | quietlist | quiet list +// TRANSLATION MISSING +| 729 | quietlist | end of quiet list | 901 | | ora si è loggati |======================================== diff --git a/doc/ja/autogen/user/irc_commands.txt b/doc/ja/autogen/user/irc_commands.txt index 36a22f0aa..79dc003e5 100644 --- a/doc/ja/autogen/user/irc_commands.txt +++ b/doc/ja/autogen/user/irc_commands.txt @@ -467,6 +467,17 @@ server: 送信先サーバ (内部サーバ名) text: 送信テキスト ........................................ +[[command_irc_quiet]] +[command]*`quiet`* quiet nicks or hosts:: +........................................ +/quiet [] [ [...]] + +channel: channel for quiet + nick: user or host to quiet + +Without argument, this command display quiet list for current channel. +........................................ + [[command_irc_quote]] [command]*`quote`* パースせずにサーバ宛に生データを送信:: ........................................ diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt index b6e85f47a..bb2ac7399 100644 --- a/doc/ja/weechat_user.ja.txt +++ b/doc/ja/weechat_user.ja.txt @@ -1988,6 +1988,10 @@ weechat:: | 433 | | ニックネームが使用されています | 438 | | ニックネームを変更する権限がありません | 671 | whois | whois (セキュアな接続) +// TRANSLATION MISSING +| 728 | quietlist | quiet list +// TRANSLATION MISSING +| 729 | quietlist | end of quiet list | 901 | | ログインに成功 |======================================== diff --git a/po/cs.po b/po/cs.po index 14f6e3d85..5294d7f33 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -5085,6 +5085,20 @@ msgstr "" "přezdívka: přezdívka pro soukromé spojení\n" " text: text, který poslat" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "zruší zakázání pro přezdívku nebo hosta" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +" kanál: kanál pro zrušení zakázání\n" +"přezdívka: uživatel nebo host, kterému zrušit zakázání" + msgid "send raw data to server without parsing" msgstr "poslat čistá data na server bez pársování" @@ -6711,6 +6725,15 @@ msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "" "%s%s: přezdívka \"%s\" je nedostupná, zkouším přezdívku číslo %d (\"%s\")" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)%s v %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: příkaz \"%s\" nenalezen:" diff --git a/po/de.po b/po/de.po index d46b83ccf..cc88d4ea9 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-10-19 17:57+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -5524,6 +5524,23 @@ msgstr "" " nick: Nickname für privaten Chat\n" " text: Text der gesendet werden soll" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "Bann aufheben (Nicks oder Hosts)" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"channel: Channel in dem der Bann ausgeführt werden soll\n" +" nick: User oder Host für den der Bann gelten soll\n" +"\n" +"Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel " +"angezeigt." + msgid "send raw data to server without parsing" msgstr "Daten direkt an Server senden (siehe RFC 2812)" @@ -7272,6 +7289,15 @@ msgstr "" "%s%s: Der Nickname \"%s\" ist nicht verfügbar. Es wird nun versucht den " "Nicknamen \"%s\" zu nutzen" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s)%s eingeladen am %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s) eingeladen" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: Befehl \"%s\" nicht gefunden:" diff --git a/po/es.po b/po/es.po index 427e54050..e1ac4b410 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5291,6 +5291,22 @@ msgstr "" " apodo: apodo con quien iniciar la conversación privada\n" " texto: texto a enviar" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "remueve vetos a apodos o máquinas" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"canal: canal para el veto\n" +"apodo: apodo o host a vetar\n" +"\n" +"Sin argumentos, este comando muestra la lista de vetos del canal actual." + msgid "send raw data to server without parsing" msgstr "enviar datos brutos al servidor sin analizar" @@ -6959,6 +6975,15 @@ msgstr "%s%s: el apodo \"%s\" ya está en uso, probando con el apodo \"%s\"" msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "%s%s: el apodo \"%s\" no está disponible, probando con el apodo \"%s\"" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)%s el %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: comando \"%s\" no encontrado:" diff --git a/po/fr.po b/po/fr.po index 2b967b62f..45c82c413 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" -"PO-Revision-Date: 2012-11-02 17:46+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" +"PO-Revision-Date: 2012-11-02 18:04+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -5441,6 +5441,21 @@ msgstr "" " pseudo: pseudo pour la conversation privée\n" " texte: texte à envoyer" +msgid "quiet nicks or hosts" +msgstr "faire taire des pseudos ou hôtes" + +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +" canal: nom du canal pour faire taire\n" +"pseudo: pseudo ou hôte à faire taire\n" +"\n" +"Sans paramètre, cette commande affiche la liste des \"quiet\" pour le canal " +"courant." + msgid "send raw data to server without parsing" msgstr "envoyer des données brutes au serveur sans analyse" @@ -7141,6 +7156,15 @@ msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "" "%s%s: le pseudo \"%s\" n'est pas disponible, essai avec le pseudo \"%s\"" +#. TRANSLATORS: "%s" after "on" is a date +#, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s rendu silencieux par %s%s %s(%s%s%s)%s le %s" + +#, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s rendu silencieux par %s%s %s(%s%s%s)" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: commande \"%s\" non trouvée:" diff --git a/po/hu.po b/po/hu.po index 13a5c11de..3d446e789 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4627,6 +4627,20 @@ msgstr "" "becenév: privát beszélgetésre hívott felhasználó beceneve\n" " szöveg: küldendő üzenet" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "gép vagy felhasználó tiltásának visszavonása" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"szoba: szoba ahol a parancsot végrehajtjuk\n" +" név: felhasználó vagy gép melyen a parancsot végrehajtjuk" + msgid "send raw data to server without parsing" msgstr "formázás nélküli nyers üzenet küldése a szervernek" @@ -6263,6 +6277,15 @@ msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s[%s%s%s] %s%s%s-t kitiltotta " + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s[%s%s%s] %s%s%s-t kitiltotta " + #, fuzzy, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s a \"%s\" modul nem található\n" diff --git a/po/it.po b/po/it.po index 5f7ac4e60..02adcfd13 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -5286,6 +5286,22 @@ msgstr "" " nick: nick per la conversazione privata\n" " testo: testo da inviare" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "rimuove il ban da nick o host" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"canale: canale per il ban\n" +" nick: utente o host su cui effettuare il ban\n" +"\n" +"Senza argomento, il comando mostra la lista dei ban per il canale corrente." + msgid "send raw data to server without parsing" msgstr "invia dati grezzi al server senza analisi" @@ -6961,6 +6977,15 @@ msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "" "%s%s: il nick \"%s\" non è disponibile, tentativo con il nick #%d (\"%s\")" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)%s il %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: comando \"%s\" non trovato:" diff --git a/po/ja.po b/po/ja.po index 1c9cb958f..df7e1ee08 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -5181,6 +5181,22 @@ msgstr "" " nick: プライベート会話を行うニックネーム\n" " text: 送信テキスト" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "ニックネームかホストの禁止設定を解除" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"channel: バン対象チャンネル\n" +" nick: バンするユーザ名かホスト名\n" +"\n" +"引数無しの場合は、現在のチャンネルのバンリストを表示。" + msgid "send raw data to server without parsing" msgstr "パースせずにサーバ宛に生データを送信" @@ -6808,6 +6824,15 @@ msgstr "" "%s%s: ニックネーム \"%s\" は利用できません、ニックネーム \"%s\" を試行してい" "ます" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s)%s によって %s に招待されました" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s) によって招待されました" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: コマンド \"%s\" が見つかりません:" diff --git a/po/pl.po b/po/pl.po index 051a930ac..59de4fe80 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -5267,6 +5267,22 @@ msgstr "" " nick: nazwa użytkownika, z którym chcemy rozpocząć prywatną rozmowę\n" " tekst: wiadomość do wysłania" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "odbanowuje nicki lub hosty" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"kanał: kanał, na którym dajemy bana\n" +" nick: użytkownik lub host do zbanowania\n" +"\n" +"Bez podania argumentu komenda wyświetla listę banów na obecnym kanale." + msgid "send raw data to server without parsing" msgstr "wyślij nieprzetworzone dane do serwera bez prasowania" @@ -6926,6 +6942,15 @@ msgstr "%s: nick \"%s\" jest już używany, próbuje nick #%d (\"%s\")" msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "%s%s: nick \"%s\" jest niedostępny, próbuje nicku #%d (\"%s\")" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez %s%s %s(%s%s%s)%s na %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez przez %s%s %s(%s%s%s)" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: nie znaleziono komendy \"%s\":" diff --git a/po/pt_BR.po b/po/pt_BR.po index b2f897e94..8e307359d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:43+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -4913,6 +4913,17 @@ msgid "" " text: text to send" msgstr "" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "obter apelido de host IRC" + +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" + msgid "send raw data to server without parsing" msgstr "" @@ -6412,6 +6423,15 @@ msgstr "%s: apelido \"%s\" já está em uso, tentando apelido #%d (\"%s\")" msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "%s%s: apelido \"%s\" está indisponível, tentando apelido #%d (\"%s\")" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)%s em %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s%s: comando \"%s\" não encontrando:" diff --git a/po/ru.po b/po/ru.po index 9afdcb543..908726a3f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: 2012-09-29 11:43+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -4654,6 +4654,20 @@ msgstr "" " ник: ник собеседника\n" "текст: отправляемый текст" +#, fuzzy +msgid "quiet nicks or hosts" +msgstr "снимает бан с хоста или ника" + +#, fuzzy +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" +"канал: канал для снятия бана\n" +" ник: ник или хост для снятия бана" + msgid "send raw data to server without parsing" msgstr "отправить сырые (raw) данные серверу" @@ -6291,6 +6305,15 @@ msgstr "%s: ник \"%s\" уже используется, пробую втор msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n" +#. TRANSLATORS: "%s" after "on" is a date +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "%s[%s%s%s] %s%s%s забанен пользователем " + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "%s[%s%s%s] %s%s%s забанен пользователем " + #, fuzzy, c-format msgid "%s%s: command \"%s\" not found:" msgstr "%s plugin \"%s\" не найден\n" diff --git a/po/weechat.pot b/po/weechat.pot index 9a2d0fa9a..febe1acff 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-11-02 17:45+0100\n" +"POT-Creation-Date: 2012-11-02 18:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4076,6 +4076,16 @@ msgid "" " text: text to send" msgstr "" +msgid "quiet nicks or hosts" +msgstr "" + +msgid "" +"channel: channel for quiet\n" +" nick: user or host to quiet\n" +"\n" +"Without argument, this command display quiet list for current channel." +msgstr "" + msgid "send raw data to server without parsing" msgstr "" @@ -5474,6 +5484,15 @@ msgstr "" msgid "%s%s: nickname \"%s\" is unavailable, trying nickname \"%s\"" msgstr "" +#. TRANSLATORS: "%s" after "on" is a date +#, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)%s on %s" +msgstr "" + +#, c-format +msgid "%s%s[%s%s%s] %s%s%s quieted by %s%s %s(%s%s%s)" +msgstr "" + #, c-format msgid "%s%s: command \"%s\" not found:" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 9e450ef9b..2d67d630e 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -3460,6 +3460,88 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } +/* + * irc_command_quiet: quiet nicks or hosts + */ + +int +irc_command_quiet (void *data, struct t_gui_buffer *buffer, int argc, + char **argv, char **argv_eol) +{ + char *pos_channel; + int pos_args; + + IRC_BUFFER_GET_SERVER_CHANNEL(buffer); + IRC_COMMAND_CHECK_SERVER("quiet", 1); + + /* make C compiler happy */ + (void) data; + (void) argv_eol; + + if (argc > 1) + { + if (irc_channel_is_channel (ptr_server, argv[1])) + { + pos_channel = argv[1]; + pos_args = 2; + } + else + { + pos_channel = NULL; + pos_args = 1; + } + + /* channel not given, use default buffer */ + if (!pos_channel) + { + if (ptr_channel && (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)) + pos_channel = ptr_channel->name; + else + { + weechat_printf (ptr_server->buffer, + _("%s%s: \"%s\" command can only be " + "executed in a channel buffer"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, + "quiet"); + return WEECHAT_RC_OK; + } + } + + if (argv[pos_args]) + { + /* loop on users */ + while (argv[pos_args]) + { + irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, + "MODE %s +q %s", + pos_channel, argv[pos_args]); + pos_args++; + } + } + else + { + irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, + "MODE %s +q", + pos_channel); + } + } + else + { + if (!ptr_channel) + { + weechat_printf (ptr_server->buffer, + _("%s%s: \"%s\" command can only be " + "executed in a channel buffer"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, "quiet"); + return WEECHAT_RC_OK; + } + irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, + "MODE %s +q", ptr_channel->name); + } + + return WEECHAT_RC_OK; +} + /* * irc_command_quote: send raw data to server */ @@ -5399,6 +5481,14 @@ irc_command_init () " nick: nick for private conversation\n" " text: text to send"), "%(nicks)|-server %(irc_servers) %-", &irc_command_query, NULL); + weechat_hook_command ("quiet", + N_("quiet nicks or hosts"), + N_("[] [ [...]]"), + N_("channel: channel for quiet\n" + " nick: user or host to quiet\n\n" + "Without argument, this command display quiet list " + "for current channel."), + "%(irc_channel_nicks_hosts)", &irc_command_quiet, NULL); weechat_hook_command ("quote", N_("send raw data to server without parsing"), N_("[-server ] "), diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 40faffcf3..e0999ea77 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -4306,6 +4306,122 @@ IRC_PROTOCOL_CALLBACK(438) return WEECHAT_RC_OK; } +/* + * irc_protocol_cb_728: '728' command received (quietlist) + */ + +IRC_PROTOCOL_CALLBACK(728) +{ + struct t_irc_channel *ptr_channel; + struct t_gui_buffer *ptr_buffer; + time_t datetime; + + /* + * 728 message looks like: + * :server 728 mynick #channel mode quietmask nick!user@host 1351350090 + */ + + IRC_PROTOCOL_MIN_ARGS(6); + + ptr_channel = irc_channel_search (server, argv[3]); + ptr_buffer = (ptr_channel && ptr_channel->nicks) ? + ptr_channel->buffer : server->buffer; + if (argc >= 8) + { + datetime = (time_t)(atol (argv[7])); + weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, "quietlist", + ptr_buffer), + irc_protocol_tags (command, "irc_numeric", NULL), + /* TRANSLATORS: "%s" after "on" is a date */ + _("%s%s[%s%s%s] %s%s%s quieted by " + "%s%s %s(%s%s%s)%s on %s"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + argv[5], + IRC_COLOR_RESET, + irc_nick_color_for_server_message (server, NULL, + irc_message_get_nick_from_host (argv[5])), + irc_message_get_nick_from_host (argv[6]), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + irc_message_get_address_from_host (argv[6]), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + weechat_util_get_time_string (&datetime)); + } + else + { + weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, "quietlist", + ptr_buffer), + irc_protocol_tags (command, "irc_numeric", NULL), + _("%s%s[%s%s%s] %s%s%s quieted by " + "%s%s %s(%s%s%s)"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + argv[5], + IRC_COLOR_RESET, + irc_nick_color_for_server_message (server, NULL, + irc_message_get_nick_from_host (argv[6])), + irc_message_get_nick_from_host (argv[6]), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + irc_message_get_address_from_host (argv[6]), + IRC_COLOR_CHAT_DELIMITERS); + } + + return WEECHAT_RC_OK; +} + +/* + * irc_protocol_cb_729: '729' command received (end of quietlist) + */ + +IRC_PROTOCOL_CALLBACK(729) +{ + char *pos_args; + struct t_irc_channel *ptr_channel; + struct t_gui_buffer *ptr_buffer; + + /* + * 729 message looks like: + * :server 729 mynick #channel mode :End of Channel Quiet List + */ + + IRC_PROTOCOL_MIN_ARGS(5); + + pos_args = (argc > 5) ? + ((argv_eol[5][0] == ':') ? argv_eol[5] + 1 : argv_eol[5]) : NULL; + + ptr_channel = irc_channel_search (server, argv[3]); + ptr_buffer = (ptr_channel && ptr_channel->nicks) ? + ptr_channel->buffer : server->buffer; + weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, "quietlist", + ptr_buffer), + irc_protocol_tags (command, "irc_numeric", NULL), + "%s%s[%s%s%s]%s%s%s", + weechat_prefix ("network"), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + (pos_args) ? " " : "", + (pos_args) ? pos_args : ""); + + return WEECHAT_RC_OK; +} + /* * irc_protocol_cb_900: '900' command (logged in as (SASL)) */ @@ -4540,6 +4656,8 @@ irc_protocol_recv_command (struct t_irc_server *server, { "501", /* unknown mode flag */ 1, 0, &irc_protocol_cb_generic_error }, { "502", /* can't change mode for other users */ 1, 0, &irc_protocol_cb_generic_error }, { "671", /* whois (secure connection) */ 1, 0, &irc_protocol_cb_whois_nick_msg }, + { "728", /* quietlist */ 1, 0, &irc_protocol_cb_728 }, + { "729", /* end of quietlist */ 1, 0, &irc_protocol_cb_729 }, { "900", /* logged in as (SASL) */ 1, 0, &irc_protocol_cb_900 }, { "901", /* you are now logged in */ 1, 0, &irc_protocol_cb_901 }, { "903", /* SASL authentication successful */ 1, 0, &irc_protocol_cb_sasl_end },