pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-07 10:13:12 +02:00
Code Activity

irc: add command /action (closes #201, issue #1577), remove alias action

Browse Source
This commit is contained in:
Sébastien Helleu
2023-05-29 09:44:13 +02:00
parent 193d290285
commit ea38779c85
25 changed files with 1565 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.adoc
+1 -1
View File
@@ -40,7 +40,6 @@ New features::
* api: add optional argument with version in info "version_number"
* alias: use lower case for default aliases, rename all aliases to lower case on upgrade (issue #1872)
* alias: add `$&` to replace all arguments with double quotes escaped (issue #1140, issue #1190)
* alias: add alias `action` to send a CTCP ACTION to a channel or a nick (issue #1577)
* alias: add option `missing` in command `/alias`
* irc: rename "ssl" options to "tls", connect with TLS and port 6697 by default
* irc: add support of capabilities "batch" and "draft/multiline" (issue #1292, issue #1923)
@@ -50,6 +49,7 @@ New features::
* irc: add modifier "irc_cap_sync_req" (issue #1767)
* irc: add support of "LINELEN" in message 005 (max message length in bytes) (issue #1927)
* irc: add support of "UTF8ONLY" in message 005 (issue #1688)
* irc: add command `/action` (issue #201, issue #1577)
* irc: add command `/rules` (issue #1864)
* irc: add command `/knock` (issue #7)
* irc: add server option "registered_mode", add fields "authentication_method" and "sasl_mechanism_used" in server (issue #1625)
po/cs.po
+35 -24
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6707,6 +6707,13 @@ msgid ""
"server"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: příkaz \"%s\" může být spuštěn pouze v bufferu kanálu nebo soukromého "
"rozhovoru"
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -6776,13 +6783,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: příkaz \"%s\" může být spuštěn pouze v bufferu kanálu nebo soukromého "
"rozhovoru"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: \"%s\" příkaz nemůže být spuštěn v bufferu serveru"
@@ -7044,6 +7044,23 @@ msgstr "%s%s: nejste na kanálu \"%s\""
msgid "Notice"
msgstr "Oznámení"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "poslat CTCP akci na aktuální kanál"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <příjemce>[,<příjemce>...] <text>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"server: poslat tomuto serveru (vnitřní jméno)\n"
"příjemce: přezdívka nebo kanál (může být maska, '*' = aktuální kanál)\n"
" text: text, který se má poslat"
msgid "find information about the administrator of the server"
msgstr "najít informace o administrátorovi serveru"
@@ -7804,18 +7821,6 @@ msgstr "získat \"Zprávu dne\""
msgid "send message to a nick or channel"
msgstr "poslat zprávu přezdívce nebo kanálu"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <příjemce>[,<příjemce>...] <text>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"server: poslat tomuto serveru (vnitřní jméno)\n"
"příjemce: přezdívka nebo kanál (může být maska, '*' = aktuální kanál)\n"
" text: text, který se má poslat"
msgid "list nicks on channels"
msgstr "vypsat přezdívky na kanálech"
@@ -9513,6 +9518,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: neznámý DCC CHAT typ obdržen od %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -9522,10 +9528,6 @@ msgstr "Volba"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sNeznámý CTCP požadavek od %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP dotaz pro %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 pokud je řetězec validní jméno IRC kanálu na serveru"
@@ -9718,6 +9720,10 @@ msgstr "irc server"
msgid "irc batch"
msgstr "irc kanál"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP dotaz pro %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: nejste připojen k serveru"
@@ -14097,3 +14103,8 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "poslat zprávu přezdívce nebo kanálu"
po/de.po
+35 -24
View File
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-25 22:34+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -8516,6 +8516,13 @@ msgstr ""
"%s%s: der Befehl /%s kann nicht ausgeführt werden, da der Kanal Modus \"%s\" "
"nicht vom Server unterstützt wird"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: Der Befehl \"%s\" kann nur in einem Kanal- oder einem privaten Buffer "
"ausgeführt werden"
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -8593,13 +8600,6 @@ msgstr ""
"Server (WIRD NICHT GESICHERT) erstellt werden, muss die Einstellung irc.look."
"temporary_servers aktiviert werden"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: Der Befehl \"%s\" kann nur in einem Kanal- oder einem privaten Buffer "
"ausgeführt werden"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr ""
@@ -8868,6 +8868,23 @@ msgstr "%s%s: Sie befinden sich nicht in einem Kanal \"%s\""
msgid "Notice"
msgstr "Hinweis"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "eine CTCP ACTION an den aktuellen Kanal senden"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <target>[,<target>...] <text>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"server: schicke an diesen Server (interner Servername)\n"
"target: Nick oder Kanal (darf eine Maske sein, '*' = aktueller c)\n"
" text: zu sendender Text"
msgid "find information about the administrator of the server"
msgstr "Information über den Server-Administrator abfragen"
@@ -9818,18 +9835,6 @@ msgstr "Die \"Mitteilung des Tages\" abfragen"
msgid "send message to a nick or channel"
msgstr "Nachricht an Nick/Kanal verschicken"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <target>[,<target>...] <text>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"server: schicke an diesen Server (interner Servername)\n"
"target: Nick oder Kanal (darf eine Maske sein, '*' = aktueller c)\n"
" text: zu sendender Text"
msgid "list nicks on channels"
msgstr "Nicknamen des Kanals auflisten"
@@ -11857,6 +11862,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: unbekannter DCC CHAT-Typ empfangen von %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -11866,10 +11872,6 @@ msgstr "Einstellung"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sunbekannte CTCP Anfrage von %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP Anfrage an %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr ""
"1, falls die Zeichenkette ein gültiger IRC-Kanalname für den Server ist"
@@ -12075,6 +12077,10 @@ msgstr "IRC-Server"
msgid "irc batch"
msgstr "IRC-Batch"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP Anfrage an %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: Es besteht keine Verbindung zum Server"
@@ -16929,3 +16935,8 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr ""
"%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "Nachricht an Nick/Kanal verschicken"
po/es.po
+35 -24
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7344,6 +7344,13 @@ msgid ""
"server"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: el comando \"%s\" sólo puede ser ejecutado en un canal o conversación "
"privada"
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -7415,13 +7422,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: el comando \"%s\" sólo puede ser ejecutado en un canal o conversación "
"privada"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: el comando \"%s\" no puede ejecutarse en el buffer del servidor"
@@ -7679,6 +7679,23 @@ msgstr "%s%s: no estas presente en el canal \"%s\""
msgid "Notice"
msgstr "Aviso"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "envía una acción CTCP al canal actual"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <servidor>] <destino>[,<destino>...] <texto>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"servidor: enviar a este servidor (nombre interno)\n"
" destino: apodo o canal (puede ser una máscara, '*' = canal actual)\n"
" texto: texto a enviar"
msgid "find information about the administrator of the server"
msgstr "busca información sobre el administrador del servidor"
@@ -8453,18 +8470,6 @@ msgstr "obtener el \"Mensaje del Día\" (MOTD)"
msgid "send message to a nick or channel"
msgstr "envía mensaje a un usuario o canal"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <servidor>] <destino>[,<destino>...] <texto>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"servidor: enviar a este servidor (nombre interno)\n"
" destino: apodo o canal (puede ser una máscara, '*' = canal actual)\n"
" texto: texto a enviar"
msgid "list nicks on channels"
msgstr "listar apodos en los canales"
@@ -10232,6 +10237,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: tipo de DCC CHAT desconocido recibido de %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -10241,10 +10247,6 @@ msgstr "Opción"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP desconocido solicitado por %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sconsulta CTCP a %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 si la cadena es un nombre de canal IRC válido para el servidor"
@@ -10450,6 +10452,10 @@ msgstr "servidor irc"
msgid "irc batch"
msgstr "canal irc"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sconsulta CTCP a %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: no estas conectado a ningún servidor"
@@ -14769,3 +14775,8 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: no es posible conectarse: error (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "envía mensaje a un usuario o canal"
po/fr.po
+29 -25
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"PO-Revision-Date: 2023-05-27 20:18+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-29 09:40+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -8313,6 +8313,13 @@ msgstr ""
"%s%s : impossible d'exécuter la commande /%s, le mode de canal \"%s\" n'est "
"pas supporté par le serveur"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s : la commande \"%s\" peut seulement être exécutée dans un tampon canal "
"ou privé"
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -8389,13 +8396,6 @@ msgstr ""
"server add\" (voir /help server); si vous voulez vraiment ajouter un serveur "
"temporaire (NON SAUVÉ), activez l'option irc.look.temporary_servers"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s : la commande \"%s\" peut seulement être exécutée dans un tampon canal "
"ou privé"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr ""
@@ -8659,6 +8659,21 @@ msgstr "%s%s : vous n'êtes pas sur le canal \"%s\""
msgid "Notice"
msgstr "Notice"
msgid "send a CTCP action to a nick or channel"
msgstr "envoyer une action CTCP à un pseudo ou canal"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <serveur>] <cible>[,<cible>...] <texte>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"serveur : envoyer à ce serveur (nom interne)\n"
" cible : pseudo ou canal (peut-être un masque, '*' = canal courant)\n"
" texte : texte à envoyer"
msgid "find information about the administrator of the server"
msgstr "trouver les informations sur l'administrateur du serveur"
@@ -9603,18 +9618,6 @@ msgstr "obtenir le message du jour"
msgid "send message to a nick or channel"
msgstr "envoyer un message à un pseudo ou canal"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <serveur>] <cible>[,<cible>...] <texte>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"serveur : envoyer à ce serveur (nom interne)\n"
" cible : pseudo ou canal (peut-être un masque, '*' = canal courant)\n"
" texte : texte à envoyer"
msgid "list nicks on channels"
msgstr "lister les pseudos sur des canaux"
@@ -11576,6 +11579,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s : type de DCC CHAT inconnu reçu de %s%s%s : \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
msgid "Action"
msgstr "Action"
@@ -11583,10 +11587,6 @@ msgstr "Action"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP inconnu demandé par %s%s%s : %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sDemande CTCP vers %s%s%s : %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 si la chaîne est un nom de canal IRC valide pour le serveur"
@@ -11789,6 +11789,10 @@ msgstr "serveur irc"
msgid "irc batch"
msgstr "batch irc"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sDemande CTCP vers %s%s%s : %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s : vous n'êtes pas connecté au serveur"
po/hu.po
+34 -23
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6205,6 +6205,11 @@ msgid ""
"server"
msgstr ""
#, fuzzy, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n"
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -6270,11 +6275,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, fuzzy, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n"
#, fuzzy, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n"
@@ -6533,6 +6533,24 @@ msgstr "%s nem sikerült új szobát nyitni \"%s\"\n"
msgid "Notice"
msgstr ""
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "CTCP parancs küldése az aktuális szobába"
#, fuzzy
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "fogadó [,fogadó] szöveg"
#, fuzzy
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"fogadó: név vagy szoba (esetleg maszk, '*' = aktuális szoba)\n"
"szöveg: küldendő üzenet"
msgid "find information about the administrator of the server"
msgstr "információ lekérdezése a szerver adminisztrátorról"
@@ -7245,19 +7263,6 @@ msgstr "\"A Napi Üzenet\" lekérdezése"
msgid "send message to a nick or channel"
msgstr "üzenet küldése egy felhasználónak vagy szobának"
#, fuzzy
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "fogadó [,fogadó] szöveg"
#, fuzzy
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"fogadó: név vagy szoba (esetleg maszk, '*' = aktuális szoba)\n"
"szöveg: küldendő üzenet"
#, fuzzy
msgid "list nicks on channels"
msgstr "felhasználók listája egy szobában"
@@ -8954,6 +8959,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s usmeretlen DCC CHAT típus érkezett a következőtől:"
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
msgid "Action"
msgstr "[parancs]"
@@ -8962,10 +8968,6 @@ msgstr "[parancs]"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
#, fuzzy, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
#, fuzzy
msgid "1 if string is a valid IRC channel name for server"
msgstr "felhasználók listája a szobában"
@@ -9177,6 +9179,10 @@ msgstr "szerver"
msgid "irc batch"
msgstr "%d szoba"
#, fuzzy, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
#, fuzzy, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s nincs csatlakozva szerverhez!\n"
@@ -13371,3 +13377,8 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
#, fuzzy, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "üzenet küldése egy felhasználónak vagy szobának"
po/it.po
+35 -24
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7040,6 +7040,13 @@ msgid ""
"server"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: il comando \"%s\" può essere eseguito soltanto in un canale o in un "
"buffer privato"
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -7112,13 +7119,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: il comando \"%s\" può essere eseguito soltanto in un canale o in un "
"buffer privato"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: il comando \"%s\" non può essere eseguito sul buffer del server"
@@ -7380,6 +7380,23 @@ msgstr "%s%s: non sei sul canale \"%s\""
msgid "Notice"
msgstr "Notice"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "invia un'azione CTCP al canale corrente"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <destinazione>[,<destinazione>...] <testo>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
" server: invia a questo server (nome interno)\n"
"destinazione: nick o canale (può essere una mask, '*' = canale corrente)\n"
" testo: testo da inviare"
msgid "find information about the administrator of the server"
msgstr "trova informazioni sull'amministratore del server"
@@ -8157,18 +8174,6 @@ msgstr "riceve il \"Messaggio Del Giorno\""
msgid "send message to a nick or channel"
msgstr "invia un messaggio ad un nick o a un canale"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <destinazione>[,<destinazione>...] <testo>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
" server: invia a questo server (nome interno)\n"
"destinazione: nick o canale (può essere una mask, '*' = canale corrente)\n"
" testo: testo da inviare"
msgid "list nicks on channels"
msgstr "elenca i nick sul canale"
@@ -9964,6 +9969,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: tipo di DCC CHAT sconosciuto ricevuto da %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -9973,10 +9979,6 @@ msgstr "Opzione"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP sconosciuto richiesto da %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sRichiesta CTCP a %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 se la stringa è il nome di un canale IRC valido per il server"
@@ -10180,6 +10182,10 @@ msgstr "server irc"
msgid "irc batch"
msgstr "canale irc"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sRichiesta CTCP a %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: non connesso al server"
@@ -14541,3 +14547,8 @@ msgstr "%s%s: timeout per \"%s\" con %s"
#, fuzzy, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: impossibile connettersi al mittente"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "invia un messaggio ad un nick o a un canale"
po/ja.po
+35 -24
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -8042,6 +8042,12 @@ msgstr ""
"%s%s: コマンド /%s を実行できません、このサーバはチャンネルモード \"%s\" をサ"
"ポートしません"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: \"%s\" コマンドはチャンネル内かプライベートバッファで実行できます"
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -8116,12 +8122,6 @@ msgstr ""
"さい (/help server を参照してください); 一時的な (保存されない) サーバを本当"
"に追加したい場合は、irc.look.temporary_servers オプションを on にしてください"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: \"%s\" コマンドはチャンネル内かプライベートバッファで実行できます"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: \"%s\" コマンドはサーババッファでは実行できません"
@@ -8374,6 +8374,24 @@ msgstr "%s%s: あなたはチャンネル \"%s\" にいません"
msgid "Notice"
msgstr "Notice"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "現在のチャンネルに CTCP action を送信"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <target>[,<target>...] <text>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"server: このサーバに送信 (内部サーバ名)\n"
"target: ニックネームまたはチャンネル名 (マスクを使えるかもしれない、'*' = 現"
"在のチャンネル)\n"
" text: 送信するテキスト"
msgid "find information about the administrator of the server"
msgstr "サーバ管理者に関する情報を探す"
@@ -9244,19 +9262,6 @@ msgstr "\"今日のメッセージ\" を取得"
msgid "send message to a nick or channel"
msgstr "ニックネームかチャンネルにメッセージを送る"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <server>] <target>[,<target>...] <text>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"server: このサーバに送信 (内部サーバ名)\n"
"target: ニックネームまたはチャンネル名 (マスクを使えるかもしれない、'*' = 現"
"在のチャンネル)\n"
" text: 送信するテキスト"
msgid "list nicks on channels"
msgstr "チャンネルに参加しているニックネームをリストアップ"
@@ -11145,6 +11150,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: %s%s%s からの未知の DCC CHAT タイプ: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -11154,10 +11160,6 @@ msgstr "オプション"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s からの未知の CTCP 要求: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s への CTCP クエリ: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "文字列がサーバの有効な IRC チャンネル名なら 1"
@@ -11359,6 +11361,10 @@ msgstr "irc サーバ"
msgid "irc batch"
msgstr "irc チャンネル"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s への CTCP クエリ: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: サーバに接続していません"
@@ -15991,3 +15997,8 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "ニックネームかチャンネルにメッセージを送る"
po/pl.po
+34 -23
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -8774,6 +8774,12 @@ msgstr ""
"%s%s: nie można wykonać komendy /%s, atrybut kanału \"%s\" nie jest "
"wspierany przez serwer"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: komenda \"%s\" może być wykonana tylko na kanale lub prywatnym buforze"
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -8849,12 +8855,6 @@ msgstr ""
"add\" (zobacz /help server); jeśli naprawdę chcesz utworzyć serwer "
"tymczasowy (NIE ZAPISANY), włącz opcję irc.look.temporary_servers"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: komenda \"%s\" może być wykonana tylko na kanale lub prywatnym buforze"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: komenda \"%s\" nie można być wykonana w buforze serwera"
@@ -9118,6 +9118,23 @@ msgstr "%s%s: nie jesteś na kanale \"%s\""
msgid "Notice"
msgstr "Powiadomienie"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "wysyła akcję CTCP na aktualny kanał"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <serwer>] <cel>[,<cel>...] <tekst>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"serwer: wyślij do tego serwera (nazwa wewnętrzna)\n"
"cel: nick lub kanał (może być maska, '*' = aktualny kanał)\n"
" tekst: wiadomość do wysłania"
msgid "find information about the administrator of the server"
msgstr "wyszukuje informacje o administratorze serwera"
@@ -10130,18 +10147,6 @@ msgstr "pobierz \"Wiadomość Dnia\" (motd)"
msgid "send message to a nick or channel"
msgstr "wysyła wiadomość do użytkownika albo kanału"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <serwer>] <cel>[,<cel>...] <tekst>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"serwer: wyślij do tego serwera (nazwa wewnętrzna)\n"
"cel: nick lub kanał (może być maska, '*' = aktualny kanał)\n"
" tekst: wiadomość do wysłania"
msgid "list nicks on channels"
msgstr "wyświetla nazwy użytkowników na kanałach"
@@ -12143,6 +12148,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: nieznany typ DCC CHAT otrzymano od %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -12152,10 +12158,6 @@ msgstr "Opcja"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sNieznane zażądane CTCP przez %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sZapytanie CTCP do %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 jeśli ciąg jest poprawną nazwą kanału IRC dla serwera"
@@ -12357,6 +12359,10 @@ msgstr "serwer irc"
msgid "irc batch"
msgstr "kanał irc"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sZapytanie CTCP do %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: nie jesteś połączony z serwerem"
@@ -17160,3 +17166,8 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "wysyła wiadomość do użytkownika albo kanału"
po/pt.po
+34 -23
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -7801,6 +7801,12 @@ msgid ""
"server"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: o comando \"%s\" só pode ser executado num buffer de canal ou privado"
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -7875,12 +7881,6 @@ msgstr ""
"add\" (ver /help server); se deseja mesmo adicionar um servidor temporário "
"(NÃO GUARDADO), ative a opção irc.look.temporary_servers"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: o comando \"%s\" só pode ser executado num buffer de canal ou privado"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: o comando \"%s\" não pode ser executado num buffer de servidor"
@@ -8141,6 +8141,23 @@ msgstr "%s%s: não está no canal \"%s\""
msgid "Notice"
msgstr "Notice"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "enviar uma ação CTCP para o canal atual"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <servidor>] <destino>[,<destino>...] <texto>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"servidor: enviar para este servidor (nome interno)\n"
" destino: nick ou canal (pode ser uma máscara, '*' = canal atual)\n"
" texto: texto a enviar"
msgid "find information about the administrator of the server"
msgstr "obter informação sobre o administrador do servidor"
@@ -9001,18 +9018,6 @@ msgstr "obter a \"Message Of The Day\" (mensagem do dia)"
msgid "send message to a nick or channel"
msgstr "enviar mensagem para um nick ou canal"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <servidor>] <destino>[,<destino>...] <texto>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"servidor: enviar para este servidor (nome interno)\n"
" destino: nick ou canal (pode ser uma máscara, '*' = canal atual)\n"
" texto: texto a enviar"
msgid "list nicks on channels"
msgstr "listar nicks em canais"
@@ -10917,6 +10922,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: tipo desconhecido de DCC CHAT recebido de %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -10926,10 +10932,6 @@ msgstr "Opção"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%spedido CTCP desconhecido por %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sconsulta CTCP a %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 se a cadeia for o nome dum canal de IRC válido no servidor"
@@ -11139,6 +11141,10 @@ msgstr "servidor de irc"
msgid "irc batch"
msgstr "canal de irc"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sconsulta CTCP a %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: não está conectado ao servidor"
@@ -15759,3 +15765,8 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "enviar mensagem para um nick ou canal"
po/pt_BR.po
+30 -19
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6945,6 +6945,11 @@ msgid ""
"server"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -7014,11 +7019,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr ""
@@ -7268,6 +7268,20 @@ msgstr ""
msgid "Notice"
msgstr ""
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "envia um CTCP action para o canal atual"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr ""
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
msgid "find information about the administrator of the server"
msgstr ""
@@ -7906,15 +7920,6 @@ msgstr ""
msgid "send message to a nick or channel"
msgstr ""
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr ""
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
msgid "list nicks on channels"
msgstr ""
@@ -9498,6 +9503,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr ""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -9507,10 +9513,6 @@ msgstr "Opção"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sRequisição CTCP desconhecida por %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr ""
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 se string é um nome de canal IRC válido para o servidor"
@@ -9713,6 +9715,10 @@ msgstr "servidor irc"
msgid "irc batch"
msgstr "canal irc"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr ""
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: você não está conectado ao servidor"
@@ -13967,3 +13973,8 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
#, fuzzy, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: não foi possível conectar ao remetente"
#, fuzzy
#~| msgid "send a private message to a nick"
#~ msgid "send action message to a nick or channel"
#~ msgstr "enviar mensagem privada a um nick"
po/ru.po
+35 -24
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6242,6 +6242,12 @@ msgid ""
"server"
msgstr ""
#, fuzzy, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s \"%s\" команда может быть выполнена только в буфере канала или привата\n"
#, fuzzy, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -6307,12 +6313,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, fuzzy, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s \"%s\" команда может быть выполнена только в буфере канала или привата\n"
#, fuzzy, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n"
@@ -6575,6 +6575,24 @@ msgstr "%s не могу создать новый канал \"%s\"\n"
msgid "Notice"
msgstr ""
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "отправить CTCP-действие на текущий канал"
#, fuzzy
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "адресат[,адресат] текст"
#, fuzzy
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"адресат: ник или канал (можно использовать маску, '*' = текущий канал)\n"
"текст: отправляаемый текст"
msgid "find information about the administrator of the server"
msgstr "найти информацию об администрации сервера"
@@ -7283,19 +7301,6 @@ msgstr "получить \"Message Of The Day\""
msgid "send message to a nick or channel"
msgstr "отправить сообщение нику или на канал"
#, fuzzy
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "адресат[,адресат] текст"
#, fuzzy
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"адресат: ник или канал (можно использовать маску, '*' = текущий канал)\n"
"текст: отправляаемый текст"
#, fuzzy
msgid "list nicks on channels"
msgstr "перечислить ники на канале"
@@ -8991,6 +8996,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s неизвестный режим DCC CHAT получен от "
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
msgid "Action"
msgstr "[команда]"
@@ -8999,10 +9005,6 @@ msgstr "[команда]"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
#, fuzzy, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
#, fuzzy
msgid "1 if string is a valid IRC channel name for server"
msgstr "список ников на канале"
@@ -9214,6 +9216,10 @@ msgstr "сервер"
msgid "irc batch"
msgstr "%d канал"
#, fuzzy, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
#, fuzzy, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s вы не подключены к серверу\n"
@@ -13405,3 +13411,8 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
#, fuzzy, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s DCC: не могу соединиться с отправителем\n"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "отправить сообщение нику или на канал"
po/sr.po
+34 -23
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-14 15:29+0200\n"
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8137,6 +8137,12 @@ msgid ""
"server"
msgstr "%s%s: команда /%s не може да се изврши, сервер не подржава режим „%s”"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: команда „%s” може да се изврши само у каналу или приватном баферу"
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -8211,12 +8217,6 @@ msgstr ""
"add” (погледајте /help server); ако заиста желите да додате привремени "
"сервер (који се НЕ ЧУВА), укључите опцију irc.look.temporary_servers"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: команда „%s” може да се изврши само у каналу или приватном баферу"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: команда „%s” не може да се изврши у серверском баферу"
@@ -8477,6 +8477,23 @@ msgstr "%s%s: нисте на каналу „%s”"
msgid "Notice"
msgstr "Notice"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "слање CTCP акције текућем каналу"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <сервер>] <циљ>[,<циљ>...] <текст>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"сервер: слање на овај сервер (интерно име)\n"
" циљ: надимак или канал (може бити и маска, ’*’ = текући канал)\n"
" текст: текст који се шаље"
msgid "find information about the administrator of the server"
msgstr "проналажење информација о администратору сервера"
@@ -9424,18 +9441,6 @@ msgstr "враћање „Message Of The Day” (поруке дана)"
msgid "send message to a nick or channel"
msgstr "слање поруке надимку или каналу"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <сервер>] <циљ>[,<циљ>...] <текст>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"сервер: слање на овај сервер (интерно име)\n"
" циљ: надимак или канал (може бити и маска, ’*’ = текући канал)\n"
" текст: текст који се шаље"
msgid "list nicks on channels"
msgstr "листа надимака на каналима"
@@ -11341,6 +11346,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: примљен је непознати DCC CHAT тип од %s%s%s: „%s”"
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -11350,10 +11356,6 @@ msgstr "Опција"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sСтигао је непознати CTCP од %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP упит за %s%s%s: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 ако је стринг важеће име IRC канала за сервер"
@@ -11552,6 +11554,10 @@ msgstr "irc server"
msgid "irc batch"
msgstr "irc channel"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP упит за %s%s%s: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: нисте повезани са сервером"
@@ -16244,3 +16250,8 @@ msgstr "%s%s: тајмаут за „%s” са %s"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "слање поруке надимку или каналу"
po/tr.po
+34 -23
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8377,6 +8377,12 @@ msgstr ""
"%s%s: /%s komutu yürütülemiyor, \"%s\" kanal kipi sunucu tarafından "
"desteklenmiyor"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: \"%s\" komutu, yalnızca bir kanalda veya özel arabellekte yürütülebilir"
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -8452,12 +8458,6 @@ msgstr ""
"kullanın (bkz. /help server); eğer gerçekten bir geçici sunucu eklemek "
"istiyorsanız (KAYDEDİLMEZ), irc.look_temporary_servers seçeneğini açın"
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
"%s%s: \"%s\" komutu, yalnızca bir kanalda veya özel arabellekte yürütülebilir"
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr "%s%s: \"%s\" komutu, bir sunucu arabelleğinde yürütülemez"
@@ -8716,6 +8716,23 @@ msgstr "%s%s: \"%s\" kanalında değilsiniz"
msgid "Notice"
msgstr "Notice"
#, fuzzy
#| msgid "send a CTCP action to the current channel"
msgid "send a CTCP action to a nick or channel"
msgstr "Geçerli kanala bir CTCP eylemi gönder"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <sunucu>] <hedef>[,<hedef>...] <metin>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"sunucu: Bu kanala gönder (içsel ad)\n"
" hedef: Takma ad veya kanal (maske olabilir, '*' = geçerli kanal)\n"
" metin: Gönderilecek metin"
msgid "find information about the administrator of the server"
msgstr "sunucu yöneticisi hakkında bilgi bul"
@@ -9715,18 +9732,6 @@ msgstr "\"Günün İletisi\"ni al"
msgid "send message to a nick or channel"
msgstr "bir takma ada veya kanala ileti gönder"
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr "[-server <sunucu>] <hedef>[,<hedef>...] <metin>"
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
"sunucu: Bu kanala gönder (içsel ad)\n"
" hedef: Takma ad veya kanal (maske olabilir, '*' = geçerli kanal)\n"
" metin: Gönderilecek metin"
msgid "list nicks on channels"
msgstr "kanaldaki takma adları listele"
@@ -11704,6 +11709,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: %s%s%s konumundan bilinmeyen DCC CHAT türü alındı: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
#, fuzzy
#| msgid "Option"
msgid "Action"
@@ -11713,10 +11719,6 @@ msgstr "Seçenek"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s tarafından bilinmeyen CTCP istendi: %s%s%s%s%s"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s konumuna CTCP sorgusu: %s%s%s%s%s"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 eğer dizi sunucu için geçerli bir IRC kanal adıysa"
@@ -11918,6 +11920,10 @@ msgstr "irc sunucusu"
msgid "irc batch"
msgstr "irc kanalı"
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s konumuna CTCP sorgusu: %s%s%s%s%s"
#, c-format
msgid "%s%s: you are not connected to server"
msgstr "%s%s: Sunucuya bağlı değilsiniz"
@@ -16637,3 +16643,8 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı"
#, c-format
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)"
#, fuzzy
#~| msgid "send message to a nick or channel"
#~ msgid "send action message to a nick or channel"
#~ msgstr "bir takma ada veya kanala ileti gönder"
po/weechat.pot
+23 -19
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-27 20:17+0200\n"
"POT-Creation-Date: 2023-05-29 09:34+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"
@@ -5709,6 +5709,11 @@ msgid ""
"server"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
#, c-format
msgid ""
"%s%s: command \"%s\" with option \"%s\" must be executed on irc buffer "
@@ -5774,11 +5779,6 @@ msgid ""
"SAVED), turn on the option irc.look.temporary_servers"
msgstr ""
#, c-format
msgid ""
"%s%s: \"%s\" command can only be executed in a channel or private buffer"
msgstr ""
#, c-format
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
msgstr ""
@@ -6027,6 +6027,18 @@ msgstr ""
msgid "Notice"
msgstr ""
msgid "send a CTCP action to a nick or channel"
msgstr ""
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr ""
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
msgid "find information about the administrator of the server"
msgstr ""
@@ -6621,15 +6633,6 @@ msgstr ""
msgid "send message to a nick or channel"
msgstr ""
msgid "[-server <server>] <target>[,<target>...] <text>"
msgstr ""
msgid ""
"server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"
msgstr ""
msgid "list nicks on channels"
msgstr ""
@@ -8036,6 +8039,7 @@ msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr ""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action
msgid "Action"
msgstr ""
@@ -8043,10 +8047,6 @@ msgstr ""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr ""
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr ""
msgid "1 if string is a valid IRC channel name for server"
msgstr ""
@@ -8228,6 +8228,10 @@ msgstr ""
msgid "irc batch"
msgstr ""
#, c-format
msgid "%sCTCP query to %s%s%s: %s%s%s%s%s"
msgstr ""
#, c-format
msgid "%s%s: you are not connected to server"
msgstr ""
src/plugins/alias/alias-config.c
-1
View File
@@ -34,7 +34,6 @@ struct t_config_section *alias_config_section_completion = NULL;
char *alias_default[][3] =
{ { "aaway", "allserv /away", NULL },
{ "action", "ctcp $1 action $2-", NULL },
{ "anick", "allserv /nick", NULL },
{ "beep", "print -beep", NULL },
{ "bye", "quit", NULL },
src/plugins/irc/irc-command.c
+236 -299
View File
@@ -354,6 +354,165 @@ irc_command_mode_masks (struct t_irc_server *server,
}
}
/*
* Sends a CTCP ACTION to a channel for a single message
* (internal function called by irc_command_me_channel).
*/
void
irc_command_me_channel_message (struct t_irc_server *server,
const char *channel_name,
const char *message)
{
struct t_arraylist *list_messages;
int i, list_size;
list_messages = irc_server_sendf (
server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH | IRC_SERVER_SEND_RETURN_LIST,
NULL,
"PRIVMSG %s :\01ACTION%s%s\01",
channel_name,
(message && message[0]) ? " " : "",
(message && message[0]) ? message : "");
if (list_messages)
{
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (server->cap_list, "echo-message"))
{
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
{
irc_input_user_message_display (
server,
channel_name,
NULL, /* address */
"privmsg",
"action",
(const char *)weechat_arraylist_get (list_messages, i),
1); /* decode_colors */
}
}
weechat_arraylist_free (list_messages);
}
}
/*
* Sends a CTCP ACTION to a channel.
*/
void
irc_command_me_channel (struct t_irc_server *server,
const char *channel_name,
const char *arguments)
{
char **list_arguments;
int i, count_arguments;
list_arguments = weechat_string_split ((arguments) ? arguments : "",
"\n", NULL, 0, 0, &count_arguments);
if (list_arguments)
{
for (i = 0; i < count_arguments; i++)
{
irc_command_me_channel_message (server, channel_name,
list_arguments[i]);
}
}
else
{
irc_command_me_channel_message (server, channel_name, "");
}
weechat_string_free_split (list_arguments);
}
/*
* Sends a CTCP ACTION to all channels of a server.
*/
void
irc_command_me_all_channels (struct t_irc_server *server, const char *arguments)
{
struct t_irc_channel *ptr_channel;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
irc_command_me_channel (server, ptr_channel->name, arguments);
}
}
/*
* Callback for command "/action": sends an action message to a nick or channel.
*/
IRC_COMMAND_CALLBACK(action)
{
char **targets;
int num_targets, i, arg_target, arg_text;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) pointer;
(void) data;
WEECHAT_COMMAND_MIN_ARGS(2, "");
arg_target = 1;
arg_text = 2;
if ((argc >= 5) && (weechat_strcmp (argv[1], "-server") == 0))
{
ptr_server = irc_server_search (argv[2]);
ptr_channel = NULL;
arg_target = 3;
arg_text = 4;
}
IRC_COMMAND_CHECK_SERVER("action", 1, 1);
targets = weechat_string_split (argv[arg_target], ",", NULL,
WEECHAT_STRING_SPLIT_STRIP_LEFT
| WEECHAT_STRING_SPLIT_STRIP_RIGHT
| WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
0, &num_targets);
if (!targets)
WEECHAT_COMMAND_ERROR;
for (i = 0; i < num_targets; i++)
{
if (strcmp (targets[i], "*") == 0)
{
if (!ptr_channel
|| ((ptr_channel->type != IRC_CHANNEL_TYPE_CHANNEL)
&& (ptr_channel->type != IRC_CHANNEL_TYPE_PRIVATE)))
{
weechat_printf (
ptr_server->buffer,
_("%s%s: \"%s\" command can only be executed in a channel "
"or private buffer"),
weechat_prefix ("error"), IRC_PLUGIN_NAME, "action *");
}
else
{
irc_command_me_channel (ptr_server, ptr_channel->name,
argv_eol[arg_text]);
}
}
else
{
irc_command_me_channel (ptr_server, targets[i], argv_eol[arg_text]);
}
}
weechat_string_free_split (targets);
return WEECHAT_RC_OK;
}
/*
* Callback for command "/admin": finds information about the administrator of
* the server.
@@ -1060,130 +1219,6 @@ end:
return WEECHAT_RC_OK;
}
/*
* Displays a ctcp action on a channel.
*/
void
irc_command_me_channel_display (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *arguments)
{
char *string;
struct t_irc_nick *ptr_nick;
/*
* if capability "echo-message" is enabled, we don't display anything,
* the message will be displayed when server sends it back to us
*/
if (weechat_hashtable_has_key (server->cap_list, "echo-message"))
return;
string = (arguments && arguments[0]) ?
irc_color_decode (arguments,
weechat_config_boolean (irc_config_network_colors_send)) : NULL;
ptr_nick = irc_nick_search (server, channel, server->nick);
weechat_printf_date_tags (
channel->buffer,
0,
irc_protocol_tags (server,
"privmsg",
NULL,
"irc_action,self_msg,notify_none,no_highlight",
server->nick, NULL),
"%s%s%s%s%s%s%s",
weechat_prefix ("action"),
irc_nick_mode_for_display (server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
(string) ? IRC_COLOR_RESET : "",
(string) ? " " : "",
(string) ? string : "");
if (string)
free (string);
}
/*
* Sends a ctcp action to a channel for a single message
* (internal function called by irc_command_me_channel).
*/
void
irc_command_me_channel_message (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *message)
{
struct t_arraylist *list_messages;
int i, list_size;
list_messages = irc_server_sendf (
server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH | IRC_SERVER_SEND_RETURN_LIST,
NULL,
"PRIVMSG %s :\01ACTION%s%s\01",
channel->name,
(message && message[0]) ? " " : "",
(message && message[0]) ? message : "");
if (list_messages)
{
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
{
irc_command_me_channel_display (
server,
channel,
(const char *)weechat_arraylist_get (list_messages, i));
}
weechat_arraylist_free (list_messages);
}
}
/*
* Sends a ctcp action to a channel.
*/
void
irc_command_me_channel (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *arguments)
{
char **list_arguments;
int i, count_arguments;
list_arguments = weechat_string_split ((arguments) ? arguments : "",
"\n", NULL, 0, 0, &count_arguments);
if (list_arguments)
{
for (i = 0; i < count_arguments; i++)
{
irc_command_me_channel_message (server, channel, list_arguments[i]);
}
}
else
{
irc_command_me_channel_message (server, channel, "");
}
weechat_string_free_split (list_arguments);
}
/*
* Sends a ctcp action to all channels of a server.
*/
void
irc_command_me_all_channels (struct t_irc_server *server, const char *arguments)
{
struct t_irc_channel *ptr_channel;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
irc_command_me_channel (server, ptr_channel, arguments);
}
}
/*
* Displays away on all channels of all servers.
*/
@@ -1851,7 +1886,6 @@ IRC_COMMAND_CALLBACK(connect)
IRC_COMMAND_CALLBACK(ctcp)
{
struct t_irc_channel *ptr_channel_target;
char **targets, *ctcp_type, str_time[512];
const char *ctcp_target, *ctcp_args;
int num_targets, arg_target, arg_type, arg_args, i;
@@ -1931,17 +1965,17 @@ IRC_COMMAND_CALLBACK(ctcp)
if (ctcp_target)
{
/* display message only if capability "echo-message" is NOT enabled */
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
ptr_channel_target = irc_channel_search (
irc_input_user_message_display (
ptr_server,
(irc_server_prefix_char_statusmsg (ptr_server,
ctcp_target[0])
&& irc_channel_is_channel (ptr_server, ctcp_target + 1)) ?
ctcp_target + 1 : ctcp_target);
irc_ctcp_display_send (ptr_server, ptr_channel_target,
ctcp_target, NULL, ctcp_type, ctcp_args);
ctcp_target,
NULL, /* address */
"privmsg",
ctcp_type,
ctcp_args,
1); /* decode_colors */
}
irc_ctcp_send (ptr_server, ctcp_target, ctcp_type, ctcp_args);
}
@@ -3501,7 +3535,7 @@ IRC_COMMAND_CALLBACK(map)
}
/*
* Callback for command "/me": sends a ctcp action to the current channel.
* Callback for command "/me": sends a CTCP ACTION to the current channel.
*/
IRC_COMMAND_CALLBACK(me)
@@ -3523,7 +3557,7 @@ IRC_COMMAND_CALLBACK(me)
return WEECHAT_RC_OK;
}
irc_command_me_channel (ptr_server, ptr_channel,
irc_command_me_channel (ptr_server, ptr_channel->name,
(argc > 1) ? argv_eol[1] : NULL);
return WEECHAT_RC_OK;
@@ -3648,10 +3682,8 @@ IRC_COMMAND_CALLBACK(motd)
IRC_COMMAND_CALLBACK(msg)
{
char **targets, *msg_pwd_hidden, *string;
int num_targets, i, j, arg_target, arg_text, is_channel, status_msg;
int hide_password;
struct t_irc_channel *ptr_channel2;
char **targets;
int num_targets, i, arg_target, arg_text;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
@@ -3698,9 +3730,18 @@ IRC_COMMAND_CALLBACK(msg)
}
else
{
irc_input_user_message_display (ptr_channel->buffer,
0, 0, NULL, 0,
argv_eol[arg_text]);
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
irc_input_user_message_display (
ptr_server,
ptr_channel->name,
NULL, /* address */
"privmsg",
NULL, /* ctcp_type */
argv_eol[arg_text],
1); /* decode_colors */
}
irc_server_sendf (ptr_server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PRIVMSG %s :%s",
@@ -3709,135 +3750,22 @@ IRC_COMMAND_CALLBACK(msg)
}
else
{
is_channel = 0;
ptr_channel2 = NULL;
status_msg = 0;
if (irc_server_prefix_char_statusmsg (ptr_server,
targets[i][0])
&& irc_channel_is_channel (ptr_server, targets[i] + 1))
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
ptr_channel2 = irc_channel_search (ptr_server, targets[i] + 1);
is_channel = 1;
status_msg = 1;
}
else
{
ptr_channel2 = irc_channel_search (ptr_server, targets[i]);
if (ptr_channel2)
is_channel = 1;
}
if (is_channel)
{
if (ptr_channel2)
{
irc_input_user_message_display (
ptr_channel2->buffer,
0, /* action */
0, /* notice */
(status_msg) ? targets[i] : NULL,
is_channel,
argv_eol[arg_text]);
}
irc_server_sendf (ptr_server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PRIVMSG %s :%s",
targets[i], argv_eol[arg_text]);
}
else
{
/* check if the password must be hidden for this nick */
hide_password = 0;
if (irc_config_nicks_hide_password)
{
for (j = 0; j < irc_config_num_nicks_hide_password; j++)
{
if (weechat_strcasecmp (irc_config_nicks_hide_password[j],
targets[i]) == 0)
{
hide_password = 1;
break;
}
}
}
if (hide_password)
{
/* hide password in message displayed using modifier */
msg_pwd_hidden = weechat_hook_modifier_exec (
"irc_message_auth",
ptr_server->name,
argv_eol[arg_text]);
string = irc_color_decode (
(msg_pwd_hidden) ? msg_pwd_hidden : argv_eol[arg_text],
weechat_config_boolean (irc_config_network_colors_send));
weechat_printf (
ptr_server->buffer,
"%sMSG%s(%s%s%s)%s: %s",
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
irc_nick_color_for_msg (ptr_server, 0, NULL,
targets[i]),
targets[i],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(string) ?
string : ((msg_pwd_hidden) ?
msg_pwd_hidden : argv_eol[arg_text]));
if (string)
free (string);
if (msg_pwd_hidden)
free (msg_pwd_hidden);
}
else
{
ptr_channel2 = irc_channel_search (ptr_server,
targets[i]);
if (ptr_channel2)
{
irc_input_user_message_display (ptr_channel2->buffer,
0, 0, NULL, 0,
argv_eol[arg_text]);
}
else
{
/*
* display message only if capability "echo-message"
* is NOT enabled
*/
if (!weechat_hashtable_has_key (ptr_server->cap_list,
"echo-message"))
{
string = irc_color_decode (
argv_eol[arg_text],
weechat_config_boolean (
irc_config_network_colors_send));
weechat_printf_date_tags (
ptr_server->buffer,
0,
irc_protocol_tags (
ptr_server,
"privmsg",
NULL,
"self_msg,notify_none,no_highlight",
ptr_server->nick, NULL),
"%sMSG%s(%s%s%s)%s: %s",
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
irc_nick_color_for_msg (
ptr_server, 0, NULL, targets[i]),
targets[i],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(string) ? string : argv_eol[arg_text]);
if (string)
free (string);
}
}
}
irc_server_sendf (ptr_server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PRIVMSG %s :%s",
targets[i], argv_eol[arg_text]);
irc_input_user_message_display (
ptr_server,
targets[i],
NULL, /* address */
"privmsg",
NULL, /* ctcp_type */
argv_eol[arg_text],
1); /* decode_colors */
}
irc_server_sendf (ptr_server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PRIVMSG %s :%s",
targets[i], argv_eol[arg_text]);
}
}
@@ -3943,8 +3871,7 @@ IRC_COMMAND_CALLBACK(nick)
IRC_COMMAND_CALLBACK(notice)
{
const char *ptr_message;
int i, arg_target, arg_text, is_channel, list_size;
struct t_irc_channel *ptr_channel;
int i, arg_target, arg_text, list_size;
struct t_arraylist *list_messages;
IRC_BUFFER_GET_SERVER(buffer);
@@ -3965,19 +3892,7 @@ IRC_COMMAND_CALLBACK(notice)
}
IRC_COMMAND_CHECK_SERVER("notice", 1, 1);
is_channel = 0;
if (irc_server_prefix_char_statusmsg (ptr_server, argv[arg_target][0])
&& irc_channel_is_channel (ptr_server, argv[arg_target] + 1))
{
ptr_channel = irc_channel_search (ptr_server, argv[arg_target] + 1);
is_channel = 1;
}
else
{
ptr_channel = irc_channel_search (ptr_server, argv[arg_target]);
if (ptr_channel)
is_channel = 1;
}
list_messages = irc_server_sendf (
ptr_server,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH | IRC_SERVER_SEND_RETURN_LIST,
@@ -3986,19 +3901,22 @@ IRC_COMMAND_CALLBACK(notice)
argv[arg_target], argv_eol[arg_text]);
if (list_messages)
{
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
ptr_message = (const char *)weechat_arraylist_get (list_messages, i);
irc_input_user_message_display (
irc_msgbuffer_get_target_buffer (
ptr_server, argv[arg_target], "notice", NULL,
(ptr_channel) ? ptr_channel->buffer : NULL),
0, /* action */
1, /* notice */
argv[arg_target],
is_channel,
ptr_message);
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
{
ptr_message = (const char *)weechat_arraylist_get (list_messages, i);
irc_input_user_message_display (
ptr_server,
argv[arg_target],
NULL, /* address */
"notice",
NULL, /* ctcp_type */
ptr_message,
1); /* decode_colors */
}
}
weechat_arraylist_free (list_messages);
}
@@ -4516,9 +4434,18 @@ IRC_COMMAND_CALLBACK(query)
/* display text if given */
if (argv_eol[arg_text])
{
irc_input_user_message_display (ptr_channel->buffer,
0, 0, NULL, 0,
argv_eol[arg_text]);
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
irc_input_user_message_display (
ptr_server,
ptr_channel->name,
NULL, /* address */
"privmsg",
NULL, /* ctcp_type */
argv_eol[arg_text],
1); /* decode_colors */
}
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH,
NULL,
"PRIVMSG %s :%s",
@@ -6761,6 +6688,16 @@ IRC_COMMAND_CALLBACK(whowas)
void
irc_command_init ()
{
weechat_hook_command (
"action",
N_("send a CTCP action to a nick or channel"),
N_("[-server <server>] <target>[,<target>...] <text>"),
N_("server: send to this server (internal name)\n"
"target: nick or channel (may be mask, '*' = current channel)\n"
" text: text to send"),
"-server %(irc_servers) %(nicks)|*"
" || %(nicks)|*",
&irc_command_action, NULL, NULL);
weechat_hook_command (
"admin",
N_("find information about the administrator of the server"),
src/plugins/irc/irc-ctcp.c
+1 -98
View File
@@ -33,6 +33,7 @@
#include "irc-channel.h"
#include "irc-color.h"
#include "irc-config.h"
#include "irc-input.h"
#include "irc-msgbuffer.h"
#include "irc-nick.h"
#include "irc-protocol.h"
@@ -1290,104 +1291,6 @@ irc_ctcp_recv (struct t_irc_server *server, time_t date,
free (dup_arguments);
}
/*
* Displays an outgoing CTCP.
*/
void
irc_ctcp_display_send (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *target, const char *address,
const char *type, const char *args)
{
struct t_irc_nick *ptr_nick;
int is_channel;
if (weechat_strcasecmp (type, "action") == 0)
{
if (!channel || irc_server_prefix_char_statusmsg (server, target[0]))
{
/* no buffer or STATUSMSG action */
is_channel = ((irc_server_prefix_char_statusmsg (server, target[0])
&& irc_channel_is_channel (server, target + 1))
|| irc_channel_is_channel (server, target));
ptr_nick = irc_nick_search (server, channel, server->nick);
weechat_printf_date_tags (
(channel) ? channel->buffer : irc_msgbuffer_get_target_buffer (
server, target, NULL, "ctcp", NULL),
0,
irc_protocol_tags (
server,
"privmsg",
NULL,
"irc_action,self_msg,notify_none,no_highlight",
server->nick,
address),
"%s%s -> %s%s%s: %s%s%s%s%s%s",
weechat_prefix ("network"),
/* TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me */
_("Action"),
(is_channel) ?
IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (server, 0, NULL, target),
target,
IRC_COLOR_RESET,
irc_nick_mode_for_display (server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
(args && args[0]) ? IRC_COLOR_RESET : "",
(args && args[0]) ? " " : "",
(args && args[0]) ? args : "");
}
else
{
/* standard action */
weechat_printf_date_tags (
(channel) ? channel->buffer : irc_msgbuffer_get_target_buffer (
server, target, NULL, "ctcp", NULL),
0,
irc_protocol_tags (
server,
"privmsg",
NULL,
"irc_action,self_msg,notify_none,no_highlight",
server->nick,
address),
"%s%s%s%s%s%s",
weechat_prefix ("action"),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
(args && args[0]) ? IRC_COLOR_RESET : "",
(args && args[0]) ? " " : "",
(args && args[0]) ? args : "");
}
}
else
{
weechat_printf_date_tags (
irc_msgbuffer_get_target_buffer (
server, target, NULL, "ctcp", NULL),
0,
irc_protocol_tags (
server,
"privmsg",
NULL,
"irc_ctcp,self_msg,notify_none,no_highlight",
NULL,
address),
_("%sCTCP query to %s%s%s: %s%s%s%s%s"),
weechat_prefix ("network"),
(channel) ?
IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (server, 0, NULL, target),
target,
IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
type,
IRC_COLOR_RESET,
(args && args[0]) ? " " : "",
(args && args[0]) ? args : "");
}
}
/*
* Sends a CTCP to a target.
*/
src/plugins/irc/irc-ctcp.h
-4
View File
@@ -49,10 +49,6 @@ extern void irc_ctcp_recv (struct t_irc_server *server, time_t date,
const char *address, const char *nick,
const char *remote_nick, const char *arguments,
const char *message);
extern void irc_ctcp_display_send (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *target, const char *address,
const char *type, const char *args);
extern void irc_ctcp_send (struct t_irc_server *server,
const char *target, const char *type,
const char *args);
src/plugins/irc/irc-input.c
+226 -117
View File
@@ -28,9 +28,11 @@
#include "irc-buffer.h"
#include "irc-server.h"
#include "irc-channel.h"
#include "irc-message.h"
#include "irc-nick.h"
#include "irc-color.h"
#include "irc-config.h"
#include "irc-msgbuffer.h"
#include "irc-protocol.h"
#include "irc-raw.h"
@@ -42,170 +44,272 @@
* If action == 0, but message is detected as an action (beginning with
* "\01ACTION "), then action is forced.
*
* If notice == 1, the message is a notice, otherwise it's a privmsg.
*
* If target is NULL, the message is displayed like this (standard message
* then action):
* If target is a channel or a nick, the message is displayed like this
* (message, action):
*
* nick | test
* * | nick is testing
*
* If target is not NULL, the message is displayed with the target, like this
* (privmsg then notice):
* If target is a channel with STATUSMSG (for example "@#test"), the message
* is displayed with the target, like this (message, action, notice):
*
* Msg(nick) -> @#test: test message for ops
* Action -> @#test: nick is testing
* Notice(nick) -> @#test: test notice for ops
*/
void
irc_input_user_message_display (struct t_gui_buffer *buffer,
int action, int notice,
const char *target, int target_is_channel,
const char *text)
irc_input_user_message_display (struct t_irc_server *server,
const char *target,
const char *address,
const char *command,
const char *ctcp_type,
const char *text,
int decode_colors)
{
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
struct t_irc_nick *ptr_nick;
char *pos, *text2, *text_decoded, str_tags[256], *str_color;
const char *ptr_target;
char *pos, *text2, *text3, *text_decoded, str_tags[256], *str_color;
const char *ptr_text;
int is_notice, is_action, is_channel, display_target;
if (!buffer || !text)
if (!server || !target)
return;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
is_notice = (weechat_strcasecmp (command, "notice") == 0);
is_action = (ctcp_type && (weechat_strcasecmp (ctcp_type, "action") == 0));
/*
* if capability "echo-message" is enabled, we don't display anything,
* the message will be displayed when server sends it back to us
*/
if (weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
return;
/* if message is an action, force "action" to 1 and extract message */
if (strncmp (text, "\01ACTION ", 8) == 0)
is_channel = 0;
ptr_channel = NULL;
display_target = is_notice || (ctcp_type && !is_action);
ptr_target = target;
if (irc_server_prefix_char_statusmsg (server, target[0])
&& irc_channel_is_channel (server, target + 1))
{
action = 1;
pos = strrchr (text + 8, '\01');
if (pos)
text2 = weechat_strndup (text + 8, pos - text - 8);
else
text2 = strdup (text + 8);
ptr_channel = irc_channel_search (server, target + 1);
is_channel = 1;
display_target = 1;
ptr_target = target + 1;
}
else
text2 = strdup (text);
text_decoded = irc_color_decode (
(text2) ? text2 : text,
weechat_config_boolean (irc_config_network_colors_send));
{
ptr_channel = irc_channel_search (server, target);
if (irc_channel_is_channel (server, target))
is_channel = 1;
}
if (ptr_channel)
{
ptr_nick = NULL;
if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
{
ptr_nick = irc_nick_search (ptr_server, ptr_channel,
ptr_server->nick);
}
ptr_buffer = ptr_channel->buffer;
}
else
{
ptr_buffer = irc_msgbuffer_get_target_buffer (
server, ptr_target, command, NULL, NULL);
if (!ptr_buffer)
ptr_buffer = server->buffer;
}
if (action)
if (ptr_buffer == server->buffer)
display_target = 1;
/* if message is an action, force "action" to 1 and extract message */
if (text)
{
if (strncmp (text, "\01ACTION ", 8) == 0)
{
is_action = 1;
pos = strrchr (text + 8, '\01');
if (pos)
text2 = weechat_strndup (text + 8, pos - text - 8);
else
text2 = strdup (text + 8);
}
else
{
text2 = strdup (text);
}
text3 = irc_message_hide_password (server, target, (text2) ? text2 : text);
text_decoded = (decode_colors) ?
irc_color_decode (
(text3) ? text3 : ((text2) ? text2 : text),
weechat_config_boolean (irc_config_network_colors_send)) : NULL;
}
else
{
text2 = NULL;
text3 = NULL;
text_decoded = NULL;
}
ptr_nick = NULL;
if (ptr_channel && (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL))
ptr_nick = irc_nick_search (server, ptr_channel, server->nick);
if (is_action)
{
snprintf (str_tags, sizeof (str_tags),
"irc_action,self_msg,notify_none,no_highlight");
}
else
{
if (display_target)
{
snprintf (str_tags, sizeof (str_tags),
"irc_action,self_msg,notify_none,no_highlight");
"%sself_msg,notify_none,no_highlight",
(ctcp_type) ? "irc_ctcp," : "");
}
else
{
str_color = irc_color_for_tags (
weechat_config_color (
weechat_config_get ("weechat.color.chat_nick_self")));
if (target)
{
snprintf (str_tags, sizeof (str_tags),
"self_msg,notify_none,no_highlight");
}
else
{
snprintf (str_tags, sizeof (str_tags),
"self_msg,notify_none,no_highlight,prefix_nick_%s",
(str_color) ? str_color : "default");
}
snprintf (str_tags, sizeof (str_tags),
"%sself_msg,notify_none,no_highlight,prefix_nick_%s",
(ctcp_type) ? "irc_ctcp," : "",
(str_color) ? str_color : "default");
if (str_color)
free (str_color);
}
ptr_text = (text_decoded) ? text_decoded : ((text2) ? text2 : text);
if (action)
}
ptr_text = (text_decoded) ?
text_decoded : ((text3) ? text3 : ((text2) ? text2 : text));
if (is_action)
{
if (display_target)
{
weechat_printf_date_tags (
buffer,
ptr_buffer,
0,
irc_protocol_tags (
ptr_server,
(notice) ? "notice" : "privmsg",
server,
command,
NULL,
str_tags,
(ptr_nick) ? ptr_nick->name : ptr_server->nick,
NULL),
"%s%s%s%s%s %s",
weechat_prefix ("action"),
irc_nick_mode_for_display (ptr_server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
ptr_server->nick,
IRC_COLOR_RESET,
ptr_text);
}
else if (target)
{
weechat_printf_date_tags (
buffer,
0,
irc_protocol_tags (
ptr_server,
(notice) ? "notice" : "privmsg",
NULL,
str_tags,
(ptr_nick) ? ptr_nick->name : ptr_server->nick,
NULL),
"%s%s%s%s%s(%s%s%s%s)%s -> %s%s%s: %s",
(ptr_nick) ? ptr_nick->name : server->nick,
address),
"%s%s -> %s%s%s: %s%s%s%s%s%s",
weechat_prefix ("network"),
(notice) ? IRC_COLOR_NOTICE : "",
(notice) ?
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
_("Notice") :
"Msg",
(notice) ? IRC_COLOR_RESET : "",
IRC_COLOR_CHAT_DELIMITERS,
irc_nick_mode_for_display (ptr_server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
ptr_server->nick,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(target_is_channel) ?
IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (ptr_server, 0, NULL, target),
/* TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me or /action */
_("Action"),
(is_channel) ?
IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (server, 0, NULL, target),
target,
IRC_COLOR_RESET,
ptr_text);
irc_nick_mode_for_display (server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
(ptr_text && ptr_text[0]) ? IRC_COLOR_RESET : "",
(ptr_text && ptr_text[0]) ? " " : "",
(ptr_text && ptr_text[0]) ? ptr_text : "");
}
else
{
weechat_printf_date_tags (
buffer,
ptr_buffer,
0,
irc_protocol_tags (
ptr_server,
"privmsg",
server,
command,
NULL,
str_tags,
(ptr_nick) ? ptr_nick->name : ptr_server->nick,
NULL),
"%s%s",
irc_nick_as_prefix (
ptr_server,
(ptr_nick) ? ptr_nick : NULL,
(ptr_nick) ? NULL : ptr_server->nick,
IRC_COLOR_CHAT_NICK_SELF),
ptr_text);
(ptr_nick) ? ptr_nick->name : server->nick,
address),
"%s%s%s%s%s%s%s",
weechat_prefix ("action"),
irc_nick_mode_for_display (server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
IRC_COLOR_RESET,
(ptr_text && ptr_text[0]) ? " " : "",
(ptr_text && ptr_text[0]) ? ptr_text : "");
}
}
else if (ctcp_type)
{
weechat_printf_date_tags (
ptr_buffer,
0,
irc_protocol_tags (
server,
command,
NULL,
str_tags,
(ptr_nick) ? ptr_nick->name : server->nick,
address),
_("%sCTCP query to %s%s%s: %s%s%s%s%s"),
weechat_prefix ("network"),
(is_channel) ?
IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (server, 0, NULL, target),
target,
IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
ctcp_type,
IRC_COLOR_RESET,
(ptr_text && ptr_text[0]) ? " " : "",
(ptr_text && ptr_text[0]) ? ptr_text : "");
}
else if (display_target)
{
weechat_printf_date_tags (
ptr_buffer,
0,
irc_protocol_tags (
server,
command,
NULL,
str_tags,
(ptr_nick) ? ptr_nick->name : server->nick,
address),
"%s%s%s%s%s(%s%s%s%s)%s -> %s%s%s: %s",
weechat_prefix ("network"),
(is_notice) ? IRC_COLOR_NOTICE : "",
(is_notice) ?
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
_("Notice") :
"Msg",
(is_notice) ? IRC_COLOR_RESET : "",
IRC_COLOR_CHAT_DELIMITERS,
irc_nick_mode_for_display (server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(is_channel) ?
IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (server, 0, NULL, target),
target,
IRC_COLOR_RESET,
(ptr_text) ? ptr_text : "");
}
else
{
weechat_printf_date_tags (
ptr_buffer,
0,
irc_protocol_tags (
server,
command,
NULL,
str_tags,
(ptr_nick) ? ptr_nick->name : server->nick,
address),
"%s%s",
irc_nick_as_prefix (
server,
(ptr_nick) ? ptr_nick : NULL,
(ptr_nick) ? NULL : server->nick,
IRC_COLOR_CHAT_NICK_SELF),
(ptr_text) ? ptr_text : "");
}
if (text2)
free (text2);
if (text3)
free (text3);
if (text_decoded)
free (text_decoded);
}
@@ -243,17 +347,22 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
ptr_channel->name, message);
if (list_messages)
{
action = (strncmp (message, "\01ACTION ", 8) == 0);
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
/* display only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
irc_input_user_message_display (
buffer,
action,
0, /* notice */
NULL, /* target */
0, /* target_is_channel */
(const char *)weechat_arraylist_get (list_messages, i));
action = (strncmp (message, "\01ACTION ", 8) == 0);
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
{
irc_input_user_message_display (
ptr_server,
ptr_channel->name,
NULL, /* address */
"privmsg",
(action) ? "action" : NULL,
(const char *)weechat_arraylist_get (list_messages, i),
1); /* decode_colors */
}
}
weechat_arraylist_free (list_messages);
}
src/plugins/irc/irc-input.h
+6 -4
View File
@@ -22,11 +22,13 @@
struct t_gui_buffer;
extern void irc_input_user_message_display (struct t_gui_buffer *buffer,
int action, int notice,
extern void irc_input_user_message_display (struct t_irc_server *server,
const char *target,
int target_is_channel,
const char *text);
const char *address,
const char *command,
const char *ctcp_type,
const char *text,
int decode_colors);
extern int irc_input_data_cb (const void *pointer, void *data,
struct t_gui_buffer *buffer,
const char *input_data);
src/plugins/irc/irc-message.c
+41
View File
@@ -893,6 +893,47 @@ irc_message_replace_vars (struct t_irc_server *server,
return res;
}
/*
* Hides password in text, if the target is a nick configured in option
* irc.look.nicks_hide_password.
*
* Note: result must be freed after use.
*/
char *
irc_message_hide_password (struct t_irc_server *server, const char *target,
const char *text)
{
int i, hide_password;
if (!text)
return NULL;
/* check if the password must be hidden for this nick */
hide_password = 0;
if (irc_config_nicks_hide_password)
{
for (i = 0; i < irc_config_num_nicks_hide_password; i++)
{
if (weechat_strcasecmp (irc_config_nicks_hide_password[i],
target) == 0)
{
hide_password = 1;
break;
}
}
}
/* hide password in message displayed using modifier */
if (hide_password)
{
return weechat_hook_modifier_exec ("irc_message_auth", server->name,
text);
}
return strdup (text);
}
/*
* Adds a message + arguments in hashtable.
*/
src/plugins/irc/irc-message.h
+2
View File
@@ -58,6 +58,8 @@ extern int irc_message_ignored (struct t_irc_server *server,
extern char *irc_message_replace_vars (struct t_irc_server *server,
const char *channel_name,
const char *string);
extern char *irc_message_hide_password (struct t_irc_server *server,
const char *target, const char *text);
extern struct t_hashtable *irc_message_split (struct t_irc_server *server,
const char *message);
src/plugins/irc/irc-protocol.c
+11 -4
View File
@@ -49,6 +49,7 @@
#include "irc-config.h"
#include "irc-ctcp.h"
#include "irc-ignore.h"
#include "irc-input.h"
#include "irc-join.h"
#include "irc-message.h"
#include "irc-mode.h"
@@ -2959,7 +2960,6 @@ IRC_PROTOCOL_CALLBACK(pong)
void
irc_protocol_privmsg_display_ctcp_send (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *target,
const char *address,
const char *arguments)
@@ -2983,7 +2983,14 @@ irc_protocol_privmsg_display_ctcp_send (struct t_irc_server *server,
ctcp_args = (pos_space) ?
weechat_strndup (pos_space + 1, pos_end - pos_space - 1) : NULL;
irc_ctcp_display_send (server, channel, target, address, ctcp_type, ctcp_args);
irc_input_user_message_display (
server,
target,
address,
"privmsg",
ctcp_type,
ctcp_args,
0); /* decode_colors */
if (ctcp_type)
free (ctcp_type);
@@ -3055,7 +3062,7 @@ IRC_PROTOCOL_CALLBACK(privmsg)
if (nick_is_me)
{
irc_protocol_privmsg_display_ctcp_send (
server, ptr_channel, params[0], address, msg_args);
server, params[0], address, msg_args);
}
else
{
@@ -3163,7 +3170,7 @@ IRC_PROTOCOL_CALLBACK(privmsg)
if (nick_is_me)
{
irc_protocol_privmsg_display_ctcp_send (
server, ptr_channel, remote_nick, address, msg_args);
server, remote_nick, address, msg_args);
}
else
{
tests/unit/plugins/irc/test-irc-protocol.cpp
+579 -406
View File
File diff suppressed because it is too large Load Diff