diff options
| -rw-r--r-- | doc/de/weechat_user.de.txt | 2 | ||||
| -rw-r--r-- | doc/en/weechat_user.en.txt | 2 | ||||
| -rw-r--r-- | doc/fr/weechat_user.fr.txt | 2 | ||||
| -rw-r--r-- | doc/it/weechat_user.it.txt | 2 | ||||
| -rw-r--r-- | po/cs.po | 42 | ||||
| -rw-r--r-- | po/de.po | 42 | ||||
| -rw-r--r-- | po/es.po | 42 | ||||
| -rw-r--r-- | po/fr.po | 44 | ||||
| -rw-r--r-- | po/hu.po | 26 | ||||
| -rw-r--r-- | po/it.po | 42 | ||||
| -rw-r--r-- | po/pl.po | 42 | ||||
| -rw-r--r-- | po/pt_BR.po | 42 | ||||
| -rw-r--r-- | po/ru.po | 26 | ||||
| -rw-r--r-- | po/weechat.pot | 26 | ||||
| -rw-r--r-- | src/plugins/relay/relay-client.c | 17 | ||||
| -rw-r--r-- | src/plugins/relay/relay-command.c | 5 | ||||
| -rw-r--r-- | src/plugins/relay/relay-completion.c | 5 | ||||
| -rw-r--r-- | src/plugins/relay/relay-config.c | 47 | ||||
| -rw-r--r-- | src/plugins/relay/relay-raw.c | 5 | ||||
| -rw-r--r-- | src/plugins/relay/relay-server.c | 37 | ||||
| -rw-r--r-- | src/plugins/relay/relay-upgrade.c | 5 |
21 files changed, 311 insertions, 192 deletions
diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 46b00e4fa..fe942b594 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -1900,7 +1900,7 @@ Zum Beispiel: ---------------------------------------- /set relay.network.password "meinPasswort" -/relay add weechat.* 9000 +/relay add weechat 9000 ---------------------------------------- Nun kann man über den Port 9000 mittels einer Oberfläche (wie QWeeChat) diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index c31bf58cf..65c2ac38d 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -1871,7 +1871,7 @@ For example: ---------------------------------------- /set relay.network.password "mypass" -/relay add weechat.* 9000 +/relay add weechat 9000 ---------------------------------------- Now you can connect on port 9000 with a remote interface (like QWeeChat), diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 91909d044..53708ccd6 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -1926,7 +1926,7 @@ Par exemple : ---------------------------------------- /set relay.network.password "mypass" -/relay add weechat.* 9000 +/relay add weechat 9000 ---------------------------------------- Maintenant vous pouvez vous connecter sur le port 9000 avec une interface diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index 1e613c58b..b87bc262a 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -1914,7 +1914,7 @@ Ad esempio: ---------------------------------------- /set relay.network.password "miapass" -/relay add weechat.* 9000 +/relay add weechat 9000 ---------------------------------------- Ora è possibile connettersi sulla porta 9000 con un'interfaccia remota @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2011-12-25 22:56+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7238,20 +7238,20 @@ msgstr "autorizace selhala" msgid "disconnected" msgstr "odpojen" -#, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +#, fuzzy, c-format +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "%s: nový klient od %s%s%s na portu %d (id: %d, přesměrovávám %s.%s)" #, c-format msgid "%s%s: not enough memory for new client" msgstr "%s%s: nedostatek paměti pro nového klienta" -#, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "%s%s: selhala autentizace s klientem %s%s%s (%s.%s)" -#, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "%s: odpojen od klienta %s%s%s (%s.%s)" msgid "Clients for relay:" @@ -7275,8 +7275,8 @@ msgstr "Žádný klient pro přesměrování" msgid "Listening on ports:" msgstr "Poslouchám na portech:" -#, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr " port %s%d%s, přesměrování: %s%s.%s%s, spuštěno v: %s" msgid "No server for relay" @@ -7360,6 +7360,14 @@ msgstr "%s%s: chyba: port \"%d\" je již používán" msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: chyba: neznámý protokol \"%s\"" +#, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: chyba: neznámý protokol \"%s\"" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: chyba: neznámý protokol \"%s\"" + #, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s%s: chyba: přesměrování pro\"%s\" již existuje" @@ -7429,24 +7437,24 @@ msgstr "ukazatel přesměrování (volitelné)" msgid "Relay raw messages" msgstr "Přeposílat čisté zprávy" -#, c-format -msgid "%s: socket closed for %s.%s (port %d)" +#, fuzzy, c-format +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "%s: soket pro %s.%s (port %d) uzavřen" -#, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s%s: nemohu akceptovat klienta na portu %d (%s.%s)" #, fuzzy, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: adresa \"%s\" nenalezena" -#, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s%s: chyba s \"bind\" na portu %d (%s.%s)" -#, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +#, fuzzy, c-format +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "%s: poslouchám na portu %d (přesměrování %s.%s, maximálně %d klientů)" #, c-format @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2012-01-16 22:33+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7665,20 +7665,20 @@ msgstr "Authentifizierung fehlgeschlagen" msgid "disconnected" msgstr "unterbrochen" -#, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +#, fuzzy, c-format +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "%s: Neuer Client von %s%s%s an Port %d (Id: %d, Relaying: %s.%s)" #, c-format msgid "%s%s: not enough memory for new client" msgstr "%s%s: Nicht genug Speicher für neuen Client" -#, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "%s%s: Authentifizierung mit Client %s%s%s (%s.%s) fehlgeschlagen" -#, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "%s: Trennung vom Client %s%s%s (%s.%s)" msgid "Clients for relay:" @@ -7702,8 +7702,8 @@ msgstr "Keinen Client für Relay" msgid "Listening on ports:" msgstr "Lausche an Ports:" -#, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr " Port %s%d%s, Relay: %s%s.%s%s, gestartet am: %s" msgid "No server for relay" @@ -7788,6 +7788,14 @@ msgstr "%s%s: Fehler: Der Port \"%d\" ist schon im Gebrauch" msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: Unbekanntes Protokoll \"%s\"" +#, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: Unbekanntes Protokoll \"%s\"" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: Unbekanntes Protokoll \"%s\"" + #, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s%s: Fehler: Relay für \"%s\" existiert bereits" @@ -7865,24 +7873,24 @@ msgstr "Relay Pointer (optional)" msgid "Relay raw messages" msgstr "Relay RAW Nachrichten" -#, c-format -msgid "%s: socket closed for %s.%s (port %d)" +#, fuzzy, c-format +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "%s: Socket für %s.%s (Port %d) geschlossen" -#, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s%s: Kann den Client am Port %d (%s.%s) nicht akzeptieren" #, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: IP Adresse \"%s\" für Relay nicht gültig" -#, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s%s: Fehler mit \"bind\" auf Port %d (%s.%s)" -#, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +#, fuzzy, c-format +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "%s: Lausche am Port %d (Relay: %s.%s, Max. %d Clients)" #, c-format @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2011-12-25 22:56+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7432,8 +7432,8 @@ msgstr "falló la autenticación" msgid "disconnected" msgstr "desconectado" -#, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +#, fuzzy, c-format +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "" "%s: nuevo cliente desde %s%s%s en el puerto %d (id: %d, retransmitiendo: %s." "%s)" @@ -7442,12 +7442,12 @@ msgstr "" msgid "%s%s: not enough memory for new client" msgstr "%s%s: no hay memoria suficiente para el nuevo cliente" -#, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "%s%s: la autenticación falló con el cliente %s%s%s (%s.%s)" -#, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "%s: desconectado del cliente %s%s%s (%s.%s)" msgid "Clients for relay:" @@ -7471,8 +7471,8 @@ msgstr "Ningún cliente para retransmitir" msgid "Listening on ports:" msgstr "Escuchando en los puertos:" -#, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr " puerto %s%d%s, repetidor: %s%s.%s%s, iniciado en: %s" msgid "No server for relay" @@ -7557,6 +7557,14 @@ msgstr "%s%s: error: puerto \"%d\" ya está en uso" msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: error: protocolo desconocido \"%s\"" +#, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: error: protocolo desconocido \"%s\"" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: error: protocolo desconocido \"%s\"" + #, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s%s: error: repetidor para \"%s\" ya existe" @@ -7628,24 +7636,24 @@ msgstr "puntero del retransmisor (opcional)" msgid "Relay raw messages" msgstr "Retransmitir mensajes en bruto" -#, c-format -msgid "%s: socket closed for %s.%s (port %d)" +#, fuzzy, c-format +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "%s: socket cerrado para %s.%s (puerto %d)" -#, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s%s: no se puede aceptar el cliente en el puerto %d (%s.%s)" #, fuzzy, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: dirección \"%s\" no encontrada" -#, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s%s: error con \"bind\" en el puerto %d (%s.%s)" -#, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +#, fuzzy, c-format +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "%s: escuchando en el puerto %d (repetidor: %s.%s, max %d clientes)" #, c-format @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" -"PO-Revision-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" +"PO-Revision-Date: 2012-01-23 12:18+0100\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -7526,20 +7526,20 @@ msgid "disconnected" msgstr "déconnecté" #, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" -msgstr "%s: nouveau client de %s%s%s sur le port %d (id: %d, relai: %s.%s)" +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" +msgstr "%s: nouveau client de %s%s%s sur le port %d (id: %d, relai: %s%s%s)" #, c-format msgid "%s%s: not enough memory for new client" msgstr "%s%s: pas assez de mémoire pour un nouveau client" #, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" -msgstr "%s%s: l'authentification a échoué avec le client %s%s%s (%s.%s)" +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" +msgstr "%s%s: l'authentification a échoué avec le client %s%s%s (%s%s%s)" #, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" -msgstr "%s: déconnecté du client %s%s%s (%s.%s)" +msgid "%s: disconnected from client %s%s%s (%s%s%s)" +msgstr "%s: déconnecté du client %s%s%s (%s%s%s)" msgid "Clients for relay:" msgstr "Clients pour le relai:" @@ -7563,8 +7563,8 @@ msgid "Listening on ports:" msgstr "Ecoute sur les ports:" #, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" -msgstr " port %s%d%s, relai: %s%s.%s%s, démarré le: %s" +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" +msgstr " port %s%d%s, relai: %s%s%s%s%s, démarré le: %s" msgid "No server for relay" msgstr "Pas de serveur pour le relai" @@ -7649,6 +7649,14 @@ msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: erreur: protocole \"%s\" inconnu" #, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: erreur: le nom est interdit pour le protocole \"%s\"" + +#, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: erreur: le nom est requis pour le protocole \"%s\"" + +#, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s%s: erreur: le relai pour \"%s\" existe déjà" @@ -7726,24 +7734,24 @@ msgid "Relay raw messages" msgstr "Messages bruts Relay" #, c-format -msgid "%s: socket closed for %s.%s (port %d)" -msgstr "%s: socket fermée pour %s.%s (port %d)" +msgid "%s: socket closed for %s%s%s (port %d)" +msgstr "%s: socket fermée pour %s%s%s (port %d)" #, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" -msgstr "%s%s: impossible d'accepter le client sur le port %d (%s.%s)" +msgid "%s%s: cannot accept client on port %d (%s%s%s)" +msgstr "%s%s: impossible d'accepter le client sur le port %d (%s%s%s)" #, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: adresse IP \"%s\" non autorisée pour le relai" #, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" -msgstr "%s%s: erreur avec le \"bind\" sur le port %d (%s.%s)" +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" +msgstr "%s%s: erreur avec le \"bind\" sur le port %d (%s%s%s)" #, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" -msgstr "%s: écoute sur le port %d (relai: %s.%s, max %d clients)" +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" +msgstr "%s: écoute sur le port %d (relai: %s%s%s, max %d clients)" #, c-format msgid "%s%s: not enough memory for listening on new port" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2011-12-25 22:56+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6778,7 +6778,7 @@ msgid "disconnected" msgstr "csatlakozva" #, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "" #, fuzzy, c-format @@ -6786,11 +6786,11 @@ msgid "%s%s: not enough memory for new client" msgstr "%s nincs elegendő memória új DCC számára\n" #, fuzzy, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n" #, fuzzy, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "Lekapcsolódott a szerverről!\n" msgid "Clients for relay:" @@ -6814,7 +6814,7 @@ msgid "Listening on ports:" msgstr "Aliaszok listája:\n" #, fuzzy, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr "%s%s%s távol: %s\n" #, fuzzy @@ -6881,6 +6881,14 @@ msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s ismeretlen billentyűparancs \"%s\"\n" #, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s ismeretlen billentyűparancs \"%s\"\n" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s ismeretlen billentyűparancs \"%s\"\n" + +#, fuzzy, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s az ignore már létezik\n" @@ -6955,11 +6963,11 @@ msgid "Relay raw messages" msgstr "hibakereső üzenetek megjelenítése" #, fuzzy, c-format -msgid "%s: socket closed for %s.%s (port %d)" +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "FIFO cső bezárva\n" #, fuzzy, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s nem sikerült a csatornát létrehozni\n" #, fuzzy, c-format @@ -6967,11 +6975,11 @@ msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s cím \"%s\" nem található\n" #, fuzzy, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s nem sikerült a csatornát létrehozni\n" #, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "" #, fuzzy, c-format @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2012-01-16 22:07+0100\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7433,20 +7433,20 @@ msgstr "autenticazione fallita" msgid "disconnected" msgstr "disconnesso" -#, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +#, fuzzy, c-format +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "%s: nuovo client da %s%s%s sulla porta %d (id: %d, relay: %s,%s)" #, c-format msgid "%s%s: not enough memory for new client" msgstr "%s%s: memoria insufficiente per il nuovo client" -#, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "%s%s: autenticazione fallita con il client %s%s%s (%s,%s)" -#, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "%s: disconnesso dal client %s%s%s (%s,%s)" msgid "Clients for relay:" @@ -7470,8 +7470,8 @@ msgstr "Nessun client per il relay" msgid "Listening on ports:" msgstr "In ascolto sulle porte:" -#, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr " porta %s%d%s, relay: %s%s.%s%s, avviato il: %s" msgid "No server for relay" @@ -7554,6 +7554,14 @@ msgstr "%s%s: errore: la porta \"%d\" è già in uso" msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: errore: protocollo \"%s\" sconosciuto" +#, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: errore: protocollo \"%s\" sconosciuto" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: errore: protocollo \"%s\" sconosciuto" + #, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s%s: errore: il relay per \"%s\" esiste già" @@ -7630,24 +7638,24 @@ msgstr "puntatore al relay (opzionale)" msgid "Relay raw messages" msgstr "messaggi raw Relay" -#, c-format -msgid "%s: socket closed for %s.%s (port %d)" +#, fuzzy, c-format +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "%s: socket chiuso per %s.%s (porta %d)" -#, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s%s: impossibile accettare il client sulla porta \"%d\" (%s.%s)" #, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: indirizzo IP \"%s\" non consentito per il relay" -#, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s%s: errore con \"bind\" sulla porta %d (%s.%s)" -#, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +#, fuzzy, c-format +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "%s: in ascolto sulla porta %d (relay: %s,%s, massimo %d client)" #, c-format @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2011-12-25 22:56+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7367,20 +7367,20 @@ msgstr "autoryzacja nie powiodła się" msgid "disconnected" msgstr "rozłączono" -#, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +#, fuzzy, c-format +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "%s: nowy klient z %s%s%s na porcie %d (id: %d, przekazuję: %s.%s)" #, c-format msgid "%s%s: not enough memory for new client" msgstr "%s%s: za mało pamięci dla nowego klienta" -#, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "%s%s: nie powiodła się autentykacja z klientem %s%s%s (%s.%s)" -#, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "%s: rozłączono od klienta %s%s%s (%s.%s)" msgid "Clients for relay:" @@ -7404,8 +7404,8 @@ msgstr "Brak klientów do przesłania" msgid "Listening on ports:" msgstr "Nasłuchuję na portach:" -#, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr " port %s%d%s, relay: %s%s.%s%s, uruchomiony: %s" msgid "No server for relay" @@ -7488,6 +7488,14 @@ msgstr "%s%s: błąd: port \"%d\" jest już w użyciu" msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: błąd: nieznany protokół \"%s\"" +#, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: błąd: nieznany protokół \"%s\"" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: błąd: nieznany protokół \"%s\"" + #, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s%s: błąd: relay dla \"%s\" już istnieje" @@ -7557,24 +7565,24 @@ msgstr "wskaźnik relay (opcjonalny)" msgid "Relay raw messages" msgstr "Nieprzetworzone wiadomości relay" -#, c-format -msgid "%s: socket closed for %s.%s (port %d)" +#, fuzzy, c-format +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "%s: gniazdo zamknięte dla %s.%s (port %d)" -#, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s%s: nie można zaakceptować klienta na porcie %d (%s.%s)" #, fuzzy, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: nie znaleziono adresu \"%s\"" -#, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s%s: błąd podczas \"bind\" na porcie %d (%s.%s)" -#, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +#, fuzzy, c-format +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "%s: nasłuchuję na porcie %d (relay:%s.%s, max %d klientów)" #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 85d602077..57020dbfe 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2011-12-25 22:56+0100\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6905,20 +6905,20 @@ msgstr "autenticação falhou" msgid "disconnected" msgstr "desconectado" -#, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +#, fuzzy, c-format +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "%s: novo cliente de %s%s%s na porta %d (id: %d, relaying: %s.%s)" #, c-format msgid "%s%s: not enough memory for new client" msgstr "%s%s: memória insuficiente para novo cliente" -#, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "%s%s: falha na autenticação com cliente %s%s%s (%s.%s)" -#, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +#, fuzzy, c-format +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "%s: desconectado do cliente %s%s%s (%s.%s)" msgid "Clients for relay:" @@ -6942,8 +6942,8 @@ msgstr "" msgid "Listening on ports:" msgstr "Escutando nas portas:" -#, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr " porta %s%d%s, relay: %s%s.%s%s, iniciado em: %s" msgid "No server for relay" @@ -7007,6 +7007,14 @@ msgstr "%s%s: erro: porta \"%d\" já está sendo utilizada" msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s%s: erro: protocolo \"%s\" desconhecido" +#, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s%s: erro: protocolo \"%s\" desconhecido" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s%s: erro: protocolo \"%s\" desconhecido" + #, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "" @@ -7081,24 +7089,24 @@ msgstr "" msgid "Relay raw messages" msgstr "" -#, c-format -msgid "%s: socket closed for %s.%s (port %d)" +#, fuzzy, c-format +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "%s: socket fechado para %s.%s (porta %d)" -#, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s%s: não foi possível aceitar o cliente na porta %d (%s.%s)" #, c-format msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s%s: endereço IP \"%s\" não permitido para relay" -#, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +#, fuzzy, c-format +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s%s: erro ao associar (\"bind\") na porta %d (%s.%s)" -#, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +#, fuzzy, c-format +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "%s: escutando na porta %d (relay: %s.%s, máximo de %d clientes)" #, c-format @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: 2012-01-07 09:24+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6801,7 +6801,7 @@ msgid "disconnected" msgstr "подключен" #, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "" #, fuzzy, c-format @@ -6809,11 +6809,11 @@ msgid "%s%s: not enough memory for new client" msgstr "%s недостаточно памяти для нового DCC\n" #, fuzzy, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "Не могу записать лог-файл \"%s\"\n" #, fuzzy, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "Отключен от сервера!\n" msgid "Clients for relay:" @@ -6837,7 +6837,7 @@ msgid "Listening on ports:" msgstr "Список сокращений:\n" #, fuzzy, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr "%s%s%s отсутствует: %s\n" #, fuzzy @@ -6904,6 +6904,14 @@ msgid "%s%s: error: unknown protocol \"%s\"" msgstr "%s неизвестная функция клавиши \"%s\"\n" #, fuzzy, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "%s неизвестная функция клавиши \"%s\"\n" + +#, fuzzy, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "%s неизвестная функция клавиши \"%s\"\n" + +#, fuzzy, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "%s игнорирование уже существует\n" @@ -6978,11 +6986,11 @@ msgid "Relay raw messages" msgstr "выводить отладочные сообщения" #, fuzzy, c-format -msgid "%s: socket closed for %s.%s (port %d)" +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "FIFO pipe закрыт\n" #, fuzzy, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "%s невозможно создать сокет\n" #, fuzzy, c-format @@ -6990,11 +6998,11 @@ msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "%s адрес \"%s\" не найден\n" #, fuzzy, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "%s невозможно создать сокет\n" #, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "" #, fuzzy, c-format diff --git a/po/weechat.pot b/po/weechat.pot index 2eab54d85..37caeb10a 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-01-23 11:36+0100\n" +"POT-Creation-Date: 2012-01-23 12:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -5931,7 +5931,7 @@ msgid "disconnected" msgstr "" #, c-format -msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)" +msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)" msgstr "" #, c-format @@ -5939,11 +5939,11 @@ msgid "%s%s: not enough memory for new client" msgstr "" #, c-format -msgid "%s%s: authentication failed with client %s%s%s (%s.%s)" +msgid "%s%s: authentication failed with client %s%s%s (%s%s%s)" msgstr "" #, c-format -msgid "%s: disconnected from client %s%s%s (%s.%s)" +msgid "%s: disconnected from client %s%s%s (%s%s%s)" msgstr "" msgid "Clients for relay:" @@ -5966,7 +5966,7 @@ msgid "Listening on ports:" msgstr "" #, c-format -msgid " port %s%d%s, relay: %s%s.%s%s, started on: %s" +msgid " port %s%d%s, relay: %s%s%s%s%s, started on: %s" msgstr "" msgid "No server for relay" @@ -6031,6 +6031,14 @@ msgid "%s%s: error: unknown protocol \"%s\"" msgstr "" #, c-format +msgid "%s%s: error: name is not allowed for protocol \"%s\"" +msgstr "" + +#, c-format +msgid "%s%s: error: name is not required for protocol \"%s\"" +msgstr "" + +#, c-format msgid "%s%s: error: relay for \"%s\" already exists" msgstr "" @@ -6095,11 +6103,11 @@ msgid "Relay raw messages" msgstr "" #, c-format -msgid "%s: socket closed for %s.%s (port %d)" +msgid "%s: socket closed for %s%s%s (port %d)" msgstr "" #, c-format -msgid "%s%s: cannot accept client on port %d (%s.%s)" +msgid "%s%s: cannot accept client on port %d (%s%s%s)" msgstr "" #, c-format @@ -6107,11 +6115,11 @@ msgid "%s%s: IP address \"%s\" not allowed for relay" msgstr "" #, c-format -msgid "%s%s: error with \"bind\" on port %d (%s.%s)" +msgid "%s%s: error with \"bind\" on port %d (%s%s%s)" msgstr "" #, c-format -msgid "%s: listening on port %d (relay: %s.%s, max %d clients)" +msgid "%s: listening on port %d (relay: %s%s%s, max %d clients)" msgstr "" #, c-format diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c index cc22ab10e..fe9c68037 100644 --- a/src/plugins/relay/relay-client.c +++ b/src/plugins/relay/relay-client.c @@ -158,7 +158,7 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server) new_client->address = strdup ((address) ? address : "?"); new_client->status = RELAY_STATUS_CONNECTED; new_client->protocol = server->protocol; - new_client->protocol_args = strdup (server->protocol_args); + new_client->protocol_args = (server->protocol_args) ? strdup (server->protocol_args) : NULL; new_client->listen_start_time = server->start_time; new_client->start_time = time (NULL); new_client->end_time = 0; @@ -189,7 +189,7 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server) relay_clients = new_client; weechat_printf (NULL, - _("%s: new client from %s%s%s on port %d (id: %d, relaying: %s.%s)"), + _("%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)"), RELAY_PLUGIN_NAME, RELAY_COLOR_CHAT_HOST, new_client->address, @@ -197,7 +197,8 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server) server->port, new_client->id, relay_protocol_string[new_client->protocol], - new_client->protocol_args); + (new_client->protocol_args) ? "." : "", + (new_client->protocol_args) ? new_client->protocol_args : ""); new_client->hook_fd = weechat_hook_fd (new_client->sock, 1, 0, 0, @@ -258,24 +259,26 @@ relay_client_set_status (struct t_relay_client *client, { case RELAY_STATUS_AUTH_FAILED: weechat_printf (NULL, - _("%s%s: authentication failed with client %s%s%s (%s.%s)"), + _("%s%s: authentication failed with client %s%s%s (%s%s%s)"), weechat_prefix ("error"), RELAY_PLUGIN_NAME, RELAY_COLOR_CHAT_HOST, client->address, RELAY_COLOR_CHAT, relay_protocol_string[client->protocol], - client->protocol_args); + (client->protocol_args) ? "." : "", + (client->protocol_args) ? client->protocol_args : ""); break; case RELAY_STATUS_DISCONNECTED: weechat_printf (NULL, - _("%s: disconnected from client %s%s%s (%s.%s)"), + _("%s: disconnected from client %s%s%s (%s%s%s)"), RELAY_PLUGIN_NAME, RELAY_COLOR_CHAT_HOST, client->address, RELAY_COLOR_CHAT, relay_protocol_string[client->protocol], - client->protocol_args); + (client->protocol_args) ? "." : "", + (client->protocol_args) ? client->protocol_args : ""); break; default: break; diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c index acb88feb4..16b4361ff 100644 --- a/src/plugins/relay/relay-command.c +++ b/src/plugins/relay/relay-command.c @@ -138,13 +138,14 @@ relay_command_server_list () } weechat_printf (NULL, - _(" port %s%d%s, relay: %s%s.%s%s, started on: %s"), + _(" port %s%d%s, relay: %s%s%s%s%s, started on: %s"), RELAY_COLOR_CHAT_BUFFER, ptr_server->port, RELAY_COLOR_CHAT, RELAY_COLOR_CHAT_BUFFER, relay_protocol_string[ptr_server->protocol], - ptr_server->protocol_args, + (ptr_server->protocol_args) ? "." : "", + (ptr_server->protocol_args) ? ptr_server->protocol_args : "", RELAY_COLOR_CHAT, date_start); i++; diff --git a/src/plugins/relay/relay-completion.c b/src/plugins/relay/relay-completion.c index 3a13f185b..dc14c9ca6 100644 --- a/src/plugins/relay/relay-completion.c +++ b/src/plugins/relay/relay-completion.c @@ -88,9 +88,10 @@ relay_completion_relays_cb (void *data, const char *completion_item, for (ptr_server = relay_servers; ptr_server; ptr_server = ptr_server->next_server) { - snprintf (protocol_name, sizeof (protocol_name), "%s.%s", + snprintf (protocol_name, sizeof (protocol_name), "%s%s%s", relay_protocol_string[ptr_server->protocol], - ptr_server->protocol_args); + (ptr_server->protocol_args) ? "." : "", + (ptr_server->protocol_args) ? ptr_server->protocol_args : ""); weechat_hook_completion_list_add (completion, protocol_name, 0, WEECHAT_LIST_POS_SORT); } diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c index c71a6d77f..0080f0cff 100644 --- a/src/plugins/relay/relay-config.c +++ b/src/plugins/relay/relay-config.c @@ -235,7 +235,7 @@ relay_config_create_option_port (void *data, protocol_number = -1; port = -1; - if (protocol && protocol_args) + if (protocol) protocol_number = relay_protocol_search (protocol); if (protocol_number < 0) @@ -246,13 +246,33 @@ relay_config_create_option_port (void *data, rc = WEECHAT_CONFIG_OPTION_SET_ERROR; } - if (weechat_config_search_option (config_file, section, option_name)) + if ((protocol_number == RELAY_PROTOCOL_WEECHAT) && protocol_args) { - weechat_printf (NULL, _("%s%s: error: relay for \"%s\" already exists"), + weechat_printf (NULL, _("%s%s: error: name is not allowed for protocol " + "\"%s\""), weechat_prefix ("error"), - RELAY_PLUGIN_NAME, option_name); + RELAY_PLUGIN_NAME, protocol); rc = WEECHAT_CONFIG_OPTION_SET_ERROR; } + else if ((protocol_number == RELAY_PROTOCOL_IRC) && !protocol_args) + { + weechat_printf (NULL, _("%s%s: error: name is not required for protocol " + "\"%s\""), + weechat_prefix ("error"), + RELAY_PLUGIN_NAME, protocol); + rc = WEECHAT_CONFIG_OPTION_SET_ERROR; + } + + if (rc != WEECHAT_CONFIG_OPTION_SET_ERROR) + { + if (weechat_config_search_option (config_file, section, option_name)) + { + weechat_printf (NULL, _("%s%s: error: relay for \"%s\" already exists"), + weechat_prefix ("error"), + RELAY_PLUGIN_NAME, option_name); + rc = WEECHAT_CONFIG_OPTION_SET_ERROR; + } + } if (rc != WEECHAT_CONFIG_OPTION_SET_ERROR) { @@ -270,17 +290,18 @@ relay_config_create_option_port (void *data, if (rc != WEECHAT_CONFIG_OPTION_SET_ERROR) { - /* create config option */ - weechat_config_new_option ( - config_file, section, - option_name, "integer", NULL, - NULL, 0, 65535, "", value, 0, - &relay_config_check_port_cb, NULL, - &relay_config_change_port_cb, NULL, - &relay_config_delete_port_cb, NULL); - if (relay_server_new (protocol_number, protocol_args, port)) + { + /* create config option */ + weechat_config_new_option ( + config_file, section, + option_name, "integer", NULL, + NULL, 0, 65535, "", value, 0, + &relay_config_check_port_cb, NULL, + &relay_config_change_port_cb, NULL, + &relay_config_delete_port_cb, NULL); rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE; + } else rc = WEECHAT_CONFIG_OPTION_SET_ERROR; } diff --git a/src/plugins/relay/relay-raw.c b/src/plugins/relay/relay-raw.c index f8c33fdaf..2b186c616 100644 --- a/src/plugins/relay/relay-raw.c +++ b/src/plugins/relay/relay-raw.c @@ -276,14 +276,15 @@ relay_raw_message_add (struct t_relay_client *client, int flags, if (client) { - snprintf (prefix, sizeof (prefix), "%s[%s%d%s] %s%s.%s %s%s", + snprintf (prefix, sizeof (prefix), "%s[%s%d%s] %s%s%s%s %s%s", weechat_color ("chat_delimiters"), weechat_color ("chat"), client->id, weechat_color ("chat_delimiters"), weechat_color ("chat_server"), relay_protocol_string[client->protocol], - client->protocol_args, + (client->protocol_args) ? "." : "", + (client->protocol_args) ? client->protocol_args : "", (flags & RELAY_RAW_FLAG_SEND) ? weechat_color ("chat_prefix_quit") : weechat_color ("chat_prefix_join"), diff --git a/src/plugins/relay/relay-server.c b/src/plugins/relay/relay-server.c index b0600a4bc..7a22df8ba 100644 --- a/src/plugins/relay/relay-server.c +++ b/src/plugins/relay/relay-server.c @@ -66,7 +66,7 @@ relay_server_get_protocol_args (const char *protocol_and_args, else { *protocol = strdup (protocol_and_args); - *protocol_args = strdup ("*"); + *protocol_args = NULL; } } @@ -85,15 +85,20 @@ relay_server_search (const char *protocol_and_args) ptr_server = NULL; - if (protocol && protocol_args) + if (protocol) { for (ptr_server = relay_servers; ptr_server; ptr_server = ptr_server->next_server) { - if ((strcmp (protocol, relay_protocol_string[ptr_server->protocol]) == 0) - && (strcmp (protocol_args, ptr_server->protocol_args) == 0)) + if (strcmp (protocol, relay_protocol_string[ptr_server->protocol]) == 0) { - break; + if (!protocol_args && !ptr_server->protocol_args) + break; + if (protocol_args && ptr_server->protocol_args + && (strcmp (protocol_args, ptr_server->protocol_args) == 0)) + { + break; + } } } } @@ -146,10 +151,11 @@ relay_server_close_socket (struct t_relay_server *server) if (!relay_signal_upgrade_received) { weechat_printf (NULL, - _("%s: socket closed for %s.%s (port %d)"), + _("%s: socket closed for %s%s%s (port %d)"), RELAY_PLUGIN_NAME, relay_protocol_string[server->protocol], - server->protocol_args, + (server->protocol_args) ? "." : "", + (server->protocol_args) ? server->protocol_args : "", server->port); } } @@ -181,12 +187,13 @@ relay_server_sock_cb (void *data, int fd) if (client_fd < 0) { weechat_printf (NULL, - _("%s%s: cannot accept client on port %d (%s.%s)"), + _("%s%s: cannot accept client on port %d (%s%s%s)"), weechat_prefix ("error"), RELAY_PLUGIN_NAME, server->port, relay_protocol_string[server->protocol], - server->protocol_args); + (server->protocol_args) ? "." : "", + (server->protocol_args) ? server->protocol_args : ""); return WEECHAT_RC_OK; } @@ -282,11 +289,12 @@ relay_server_create_socket (struct t_relay_server *server) sizeof (server_addr)) < 0) { weechat_printf (NULL, - _("%s%s: error with \"bind\" on port %d (%s.%s)"), + _("%s%s: error with \"bind\" on port %d (%s%s%s)"), weechat_prefix ("error"), RELAY_PLUGIN_NAME, server->port, relay_protocol_string[server->protocol], - server->protocol_args); + (server->protocol_args) ? "." : "", + (server->protocol_args) ? server->protocol_args : ""); close (server->sock); server->sock = -1; return 0; @@ -297,11 +305,12 @@ relay_server_create_socket (struct t_relay_server *server) listen (server->sock, max_clients); weechat_printf (NULL, - _("%s: listening on port %d (relay: %s.%s, max %d clients)"), + _("%s: listening on port %d (relay: %s%s%s, max %d clients)"), RELAY_PLUGIN_NAME, server->port, relay_protocol_string[server->protocol], - server->protocol_args, + (server->protocol_args) ? "." : "", + (server->protocol_args) ? server->protocol_args : "", max_clients); server->hook_fd = weechat_hook_fd (server->sock, @@ -338,7 +347,7 @@ relay_server_new (enum t_relay_protocol protocol, { new_server->protocol = protocol; new_server->protocol_args = - (protocol_args) ? strdup (protocol_args) : strdup ("*"); + (protocol_args) ? strdup (protocol_args) : NULL; new_server->port = port; new_server->sock = -1; new_server->hook_fd = NULL; diff --git a/src/plugins/relay/relay-upgrade.c b/src/plugins/relay/relay-upgrade.c index 1746524ac..c0bf01a0c 100644 --- a/src/plugins/relay/relay-upgrade.c +++ b/src/plugins/relay/relay-upgrade.c @@ -160,6 +160,7 @@ relay_upgrade_read_cb (void *data, struct t_infolist *infolist) { struct t_relay_client *new_client; + const char *str; /* make C compiler happy */ (void) data; @@ -179,7 +180,9 @@ relay_upgrade_read_cb (void *data, new_client->address = strdup (weechat_infolist_string (infolist, "address")); new_client->status = weechat_infolist_integer (infolist, "status"); new_client->protocol = weechat_infolist_integer (infolist, "protocol"); - new_client->protocol_args = strdup (weechat_infolist_string (infolist, "protocol_args")); + str = weechat_infolist_string (infolist, "protocol_args"); + if (str) + new_client->protocol_args = strdup (str); new_client->listen_start_time = weechat_infolist_time (infolist, "listen_start_time"); new_client->start_time = weechat_infolist_time (infolist, "start_time"); new_client->end_time = weechat_infolist_time (infolist, "end_time"); |