From e85ae88b255ec032ceb91d8e026e4f736c468726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 2 Nov 2014 11:16:39 +0100 Subject: [PATCH] relay: don't remove relay from config when the binding fails (closes #225), add options "stop" and "restart" in command /relay --- ChangeLog.asciidoc | 2 + doc/de/autogen/user/relay_commands.asciidoc | 60 +++++----- doc/en/autogen/user/relay_commands.asciidoc | 22 ++-- doc/fr/autogen/user/relay_commands.asciidoc | 28 +++-- doc/it/autogen/user/relay_commands.asciidoc | 62 +++++----- doc/ja/autogen/user/relay_commands.asciidoc | 60 +++++----- doc/pl/autogen/user/relay_commands.asciidoc | 62 +++++----- po/cs.po | 33 ++++-- po/de.po | 35 ++++-- po/es.po | 33 ++++-- po/fr.po | 68 +++++++---- po/hu.po | 33 ++++-- po/it.po | 35 ++++-- po/ja.po | 35 ++++-- po/pl.po | 35 ++++-- po/pt_BR.po | 33 ++++-- po/ru.po | 33 ++++-- po/tr.po | 33 ++++-- po/weechat.pot | 33 ++++-- src/plugins/relay/relay-command.c | 118 ++++++++++++++++---- src/plugins/relay/relay-server.c | 10 +- 21 files changed, 587 insertions(+), 276 deletions(-) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index ff3f2e430..a0f662f42 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -32,6 +32,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * irc: display own nick changes in server buffer (closes #188) * irc: disable creation of temporary servers by default with command /connect, new option irc.look.temporary_servers +* relay: add options "stop" and "restart" in command /relay * relay: add option relay.network.ssl_priorities (closes #234) * relay: add host in sender for IRC backlog PRIVMSG messages sent to clients * trigger: evaluate and replace regex groups at same time, new format for regex @@ -55,6 +56,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * irc: fix translation of CTCP PING reply (closes #137) * lua: add detection of Lua 5.2 * python: fix Python detection with Homebrew (closes #217) +* relay: don't remove relay from config when the binding fails (closes #225) * relay: use comma separator in option relay.irc.backlog_tags, check the value of option when it is changed with /set * relay: remove "::ffff:" from IPv4-mapped IPv6 client address (closes #111) diff --git a/doc/de/autogen/user/relay_commands.asciidoc b/doc/de/autogen/user/relay_commands.asciidoc index a326b630b..54a45aa93 100644 --- a/doc/de/autogen/user/relay_commands.asciidoc +++ b/doc/de/autogen/user/relay_commands.asciidoc @@ -3,44 +3,52 @@ ---- /relay list|listfull|listrelay - add [ipv4.][ipv6.][ssl.] - del [ipv4.][ipv6.][ssl.] + add + del|stop|restart raw sslcertkey - list: Auflistung der Relay-Clients (nur aktive Relays) - listfull: detaillierte Auflistung der Relay-Clients (alle Relays) - listrelay: Auflistung der Relays (Name und Port) - add: fügt ein Relay, für ein Protokoll + Name, hinzu - del: entfernt Relay für ein Protokoll + Name - ipv4: erzwingt die Nutzung von IPv4 - ipv6: erzwingt die Nutzung von IPv6 - ssl: aktiviert SSL -protocol.name: Protokoll und Name des Relay: - - Protokoll "irc": Name des Servers welcher geteilt werden soll (optional). Wird kein Name angegeben, dann muss der Client den Servernamen mittels Befehl "PASS" anfordern. Format: "PASS Server:Passwort") - - Protokoll "weechat" (Name wird nicht unterstützt) - port: Port den das Relay nutzen soll - raw: öffnet Buffer mit RAW-Relay Daten - sslcertkey: setzt SSL Zertifikat/Schlüssel mittels Eintrag in Option relay.network.ssl_cert_key + list: list relay clients (only active relays) + listfull: list relay clients (verbose, all relays) + listrelay: list relays (name and port) + add: add a relay (listen on a port) + del: remove a relay (clients remain connected) + stop: close the server socket (clients remain connected) + restart: close the server socket and listen again on port (clients remain connected) + name: relay name (see format below) + port: port used for relay + raw: open buffer with raw Relay data + sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key -Ohne Angabe von Argumenten werden alle Relay-Clients in einem neuen Buffer dargestellt. +Relay name is: [ipv4.][ipv6.][ssl.] + ipv4: force use of IPv4 + ipv6: force use of IPv6 + ssl: enable SSL +protocol.name: protocol and name to relay: + - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password") + - protocol "weechat" (name is not used) -Beispiele: - IRC Proxy für Server "freenode": +The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port. +The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/ + +Without argument, this command opens buffer with list of relay clients. + +Examples: + irc proxy, for server "freenode": /relay add irc.freenode 8000 - IRC Proxy, für Server "freenode", mit SSL: + irc proxy, for server "freenode", with SSL: /relay add ssl.irc.freenode 8001 - IRC Proxy für alle Server (Client wählt aus), mit SSL: + irc proxy, for all servers (client will choose), with SSL: /relay add ssl.irc 8002 - WeeChat Protokoll: + weechat protocol: /relay add weechat 9000 - WeeChat Protokoll, mit SSL: + weechat protocol with SSL: /relay add ssl.weechat 9001 - WeeChat Protokoll, mit SSL, nur IPv4 nutzen: + weechat protocol with SSL, using only IPv4: /relay add ipv4.ssl.weechat 9001 - WeeChat Protokoll, mit SSL, nur IPv6 nutzen: + weechat protocol with SSL, using only IPv6: /relay add ipv6.ssl.weechat 9001 - WeeChat Protokoll, mit SSL, mit IPv4 + IPv6: + weechat protocol with SSL, using IPv4 + IPv6: /relay add ipv4.ipv6.ssl.weechat 9001 ---- diff --git a/doc/en/autogen/user/relay_commands.asciidoc b/doc/en/autogen/user/relay_commands.asciidoc index 645989442..da5b8215d 100644 --- a/doc/en/autogen/user/relay_commands.asciidoc +++ b/doc/en/autogen/user/relay_commands.asciidoc @@ -3,25 +3,33 @@ ---- /relay list|listfull|listrelay - add [ipv4.][ipv6.][ssl.] - del [ipv4.][ipv6.][ssl.] + add + del|stop|restart raw sslcertkey list: list relay clients (only active relays) listfull: list relay clients (verbose, all relays) listrelay: list relays (name and port) - add: add relay for a protocol + name - del: remove relay for a protocol + name + add: add a relay (listen on a port) + del: remove a relay (clients remain connected) + stop: close the server socket (clients remain connected) + restart: close the server socket and listen again on port (clients remain connected) + name: relay name (see format below) + port: port used for relay + raw: open buffer with raw Relay data + sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key + +Relay name is: [ipv4.][ipv6.][ssl.] ipv4: force use of IPv4 ipv6: force use of IPv6 ssl: enable SSL protocol.name: protocol and name to relay: - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password") - protocol "weechat" (name is not used) - port: port used for relay - raw: open buffer with raw Relay data - sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key + +The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port. +The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/ Without argument, this command opens buffer with list of relay clients. diff --git a/doc/fr/autogen/user/relay_commands.asciidoc b/doc/fr/autogen/user/relay_commands.asciidoc index 229e4861c..ea1262336 100644 --- a/doc/fr/autogen/user/relay_commands.asciidoc +++ b/doc/fr/autogen/user/relay_commands.asciidoc @@ -3,25 +3,33 @@ ---- /relay list|listfull|listrelay - add [ipv4.][ipv6.][ssl.] - del [ipv4.][ipv6.][ssl.] + add + del|stop|restart raw sslcertkey - list : lister les clients pour le relai - listfull : lister les clients pour le relai (verbeux) - listrelay : lister les relais (nom et port) - add : ajouter un relai pour un protocole + nom - del : supprimer un relai pour un protocole + nom + list : lister les clients pour le relai + listfull : lister les clients pour le relai (verbeux) + listrelay : lister les relais (nom et port) + add : ajouter un relai (écouter sur un port) + del : supprimer un relai (les clients restent connectés) + stop : fermer le socket serveur (les clients restent connectés) + restart : fermer le socket serveur et écouter à nouveau sur le port (les clients restent connectés) + nom : nom du relai (voir le format ci-dessous) + port : port utilisé pour le relai + raw : ouvrir le tampon avec les données brutes Relay +sslcertkey : définir le certificat/clé SSL en utilisant le chemin de l'option relay.network.ssl_cert_key + +Le nom du relai est : [ipv4.][ipv6.][ssl.] ipv4 : forcer l'utilisation d'IPv4 ipv6 : forcer l'utilisation d'IPv6 ssl : activer SSL protocole.nom : protocole et nom à relayer : - protocole "irc" : le nom est le serveur à partager (optionnel, si non donné, le nom de serveur doit être envoyé par le client dans la commande "PASS", avec le format : "PASS serveur:motdepasse") - protocole "weechat" (le nom n'est pas utilisé) - port : port utilisé pour le relai - raw : ouvrir le tampon avec les données brutes Relay - sslcertkey : définir le certificat/clé SSL en utilisant le chemin de l'option relay.network.ssl_cert_key + +Le protocole "irc" permet à n'importe quel client IRC (incluant WeeChat lui-même) de se connecter sur le port. +Le protocole "weechat" permet à une interface distante de se connecter sur le port, voir la liste ici : http://weechat.org/download/ Sans paramètre, cette commande ouvre le tampon avec la liste des clients pour le relai. diff --git a/doc/it/autogen/user/relay_commands.asciidoc b/doc/it/autogen/user/relay_commands.asciidoc index 76179fb76..c34d7fd82 100644 --- a/doc/it/autogen/user/relay_commands.asciidoc +++ b/doc/it/autogen/user/relay_commands.asciidoc @@ -3,44 +3,52 @@ ---- /relay list|listfull|listrelay - add [ipv4.][ipv6.][ssl.] - del [ipv4.][ipv6.][ssl.] + add + del|stop|restart raw sslcertkey - list: elenca i client relay (solo quelli attivi) - listfull: elenca i client relay (dettagliato, tutti i relay) - listrelay: elenca i relay (nome e porta) - add: aggiunge relay per un protocollo + nome - del: rimuove relay per un protocollo + nome - ipv4: forza l'uso del protocollo IPv4 - ipv6: forza l'uso del protocollo IPv6 - ssl: abilita SSL -protocollo.nome: protocollo e nome con cui effettuare il relay - - protocollo "irc": il nome è il server da condividere - (opzionale, -se non fornito, il nome del server deve essere inviato dal client nel comando "PASS", con il formato: "PASS server:password") - - protocollo "weechat" (il nome non viene usato) - porta: porta usata per il relay - raw: apre il buffer con dati raw Relay - sslcertkey: imposta chiave/certificato SSl usando un path nell'opzione relay.network.ssl_cert_key + list: list relay clients (only active relays) + listfull: list relay clients (verbose, all relays) + listrelay: list relays (name and port) + add: add a relay (listen on a port) + del: remove a relay (clients remain connected) + stop: close the server socket (clients remain connected) + restart: close the server socket and listen again on port (clients remain connected) + name: relay name (see format below) + port: port used for relay + raw: open buffer with raw Relay data + sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key -Senza argomento, il comando apre i buffer con l'elenco dei client relay. +Relay name is: [ipv4.][ipv6.][ssl.] + ipv4: force use of IPv4 + ipv6: force use of IPv6 + ssl: enable SSL +protocol.name: protocol and name to relay: + - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password") + - protocol "weechat" (name is not used) -Esempi: - proxy irc, per il server "freenode": +The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port. +The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/ + +Without argument, this command opens buffer with list of relay clients. + +Examples: + irc proxy, for server "freenode": /relay add irc.freenode 8000 - irc proxy, per il server "freenode", con SSL: + irc proxy, for server "freenode", with SSL: /relay add ssl.irc.freenode 8001 - protocollo weechat: + irc proxy, for all servers (client will choose), with SSL: + /relay add ssl.irc 8002 + weechat protocol: /relay add weechat 9000 - protocollo weechat con SSL: + weechat protocol with SSL: /relay add ssl.weechat 9001 - protocollo weechat con SSL, usando solo IPv4: + weechat protocol with SSL, using only IPv4: /relay add ipv4.ssl.weechat 9001 - protocollo weechat con SSL, usando solo IPv6: + weechat protocol with SSL, using only IPv6: /relay add ipv6.ssl.weechat 9001 - protocollo weechat con SSL, usando IPv4 + IPv6: + weechat protocol with SSL, using IPv4 + IPv6: /relay add ipv4.ipv6.ssl.weechat 9001 ---- diff --git a/doc/ja/autogen/user/relay_commands.asciidoc b/doc/ja/autogen/user/relay_commands.asciidoc index 6c03dab56..c7f6c2887 100644 --- a/doc/ja/autogen/user/relay_commands.asciidoc +++ b/doc/ja/autogen/user/relay_commands.asciidoc @@ -3,44 +3,52 @@ ---- /relay list|listfull|listrelay - add [ipv4.][ipv6.][ssl.] - del [ipv4.][ipv6.][ssl.] + add + del|stop|restart raw sslcertkey - list: リレーするクライアントをリストアップ (アクティブなもののみ) - listfull: リレーするクライアントをリストアップ (詳細、全てのリレー) - listrelay: リレーをリストアップ (名前とポート番号) - add: プロトコル + 名前のリレーを追加 - del: プロトコル + 名前のリレーを削除 - ipv4: IPv4 を強制的に利用 - ipv6: IPv6 を強制的に利用 - ssl: SSL を有効化 -protocol.name: リレーするプロトコルと名前: - - protocol "irc": name は共有するサーバ名 (任意指定、指定しない場合、サーバ名は "PASS" コマンドでクライアントが送信するものと同じでなければいけません、"PASS" コマンドのフォーマットは "PASS server:password") - - protocol "weechat" (name は使われません) - port: リレーに使うポート番号 - raw: 生 Relay データバッファを開く - sslcertkey: オプション relay.network.ssl_cert_key のパスを使って SSL 証明書/鍵を設定 + list: list relay clients (only active relays) + listfull: list relay clients (verbose, all relays) + listrelay: list relays (name and port) + add: add a relay (listen on a port) + del: remove a relay (clients remain connected) + stop: close the server socket (clients remain connected) + restart: close the server socket and listen again on port (clients remain connected) + name: relay name (see format below) + port: port used for relay + raw: open buffer with raw Relay data + sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key -引数無しの場合、リレークライアントのリストを含むバッファを開く +Relay name is: [ipv4.][ipv6.][ssl.] + ipv4: force use of IPv4 + ipv6: force use of IPv6 + ssl: enable SSL +protocol.name: protocol and name to relay: + - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password") + - protocol "weechat" (name is not used) -例: - サーバ "freenode" に対する irc プロキシを設定: +The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port. +The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/ + +Without argument, this command opens buffer with list of relay clients. + +Examples: + irc proxy, for server "freenode": /relay add irc.freenode 8000 - サーバ "freenode" に対する SSL を有効化した irc プロキシを設定: + irc proxy, for server "freenode", with SSL: /relay add ssl.irc.freenode 8001 - SSL を有効化してすべてのサーバに対する irc プロキシを設定 (クライアントがサーバを選ぶ): + irc proxy, for all servers (client will choose), with SSL: /relay add ssl.irc 8002 - weechat プロトコル: + weechat protocol: /relay add weechat 9000 - SSL を有効化した weechat プロトコル: + weechat protocol with SSL: /relay add ssl.weechat 9001 - SSL を有効にした weechat プロトコル、IPv4 だけを利用: + weechat protocol with SSL, using only IPv4: /relay add ipv4.ssl.weechat 9001 - SSL を有効にした weechat プロトコル、IPv6 だけを利用: + weechat protocol with SSL, using only IPv6: /relay add ipv6.ssl.weechat 9001 - SSL を有効にした weechat プロトコル、IPv4 と IPv6 を利用: + weechat protocol with SSL, using IPv4 + IPv6: /relay add ipv4.ipv6.ssl.weechat 9001 ---- diff --git a/doc/pl/autogen/user/relay_commands.asciidoc b/doc/pl/autogen/user/relay_commands.asciidoc index c0562f1d0..fa9517206 100644 --- a/doc/pl/autogen/user/relay_commands.asciidoc +++ b/doc/pl/autogen/user/relay_commands.asciidoc @@ -3,44 +3,52 @@ ---- /relay list|listfull|listrelay - add [ipv4.][ipv6.][ssl.] - del [ipv4.][ipv6.][ssl.] + add + del|stop|restart raw - kluczSSL + sslcertkey - list: wyświetla klienty relay (tylko aktywne) - listfull: wyświetla klienty relay (wszystkie) - listrelay: wyświetla relaye (nazwa i port) - add: dodaje relay dla protokołu + nazwa - del: usuwa relay dla protokołu + nazwa - ipv4: wymusza użycie IPv4 - ipv6: wymusza użycie IPv6 - ssl: włącza SSL -protokół.nazwa: protokół i nazwa dla relay: - - protokół "irc": nazwą jest dzielony serwer (opcjonalnie, jeśli nie zostanie podana, nazwa serwera musi zostać wysłanaprzez klienta w komendzie"PASS", w formacie: "PASS serwer:hasło") - - protokół "weechat" (nazwa nie jest używana) - port: port używany przez relay - raw: otwiera bufor z nieprzetworzonymi danymi Relay - kluczSSL: ustawia certyfikat SSL/hasło używając ścieżki w opcji relay.network.ssl_cert_key + list: list relay clients (only active relays) + listfull: list relay clients (verbose, all relays) + listrelay: list relays (name and port) + add: add a relay (listen on a port) + del: remove a relay (clients remain connected) + stop: close the server socket (clients remain connected) + restart: close the server socket and listen again on port (clients remain connected) + name: relay name (see format below) + port: port used for relay + raw: open buffer with raw Relay data + sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key -Bez argumentu komenda otwiera bufor z listą klientów relay. +Relay name is: [ipv4.][ipv6.][ssl.] + ipv4: force use of IPv4 + ipv6: force use of IPv6 + ssl: enable SSL +protocol.name: protocol and name to relay: + - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password") + - protocol "weechat" (name is not used) -Przykłady: - pośrednik irc dla serwera "freenode": +The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port. +The "weechat" protocol allows a remote interface to connect on the port, see the list here: http://weechat.org/download/ + +Without argument, this command opens buffer with list of relay clients. + +Examples: + irc proxy, for server "freenode": /relay add irc.freenode 8000 - pośrednik irc dla serwera "freenode", z SSL: + irc proxy, for server "freenode", with SSL: /relay add ssl.irc.freenode 8001 - pośrednik irc dla wszystkich serwerów (klient wybiera) z SSL: + irc proxy, for all servers (client will choose), with SSL: /relay add ssl.irc 8002 - protokół weechat: + weechat protocol: /relay add weechat 9000 - protokół weechat z SSL: + weechat protocol with SSL: /relay add ssl.weechat 9001 - protokół weechat z SSL, używający tylko IPv4: + weechat protocol with SSL, using only IPv4: /relay add ipv4.ssl.weechat 9001 - protokół weechat z SSL, używający tylko IPv6: + weechat protocol with SSL, using only IPv6: /relay add ipv6.ssl.weechat 9001 - protokół weechat z SSL, używający IPv4 + IPv6: + weechat protocol with SSL, using IPv4 + IPv6: /relay add ipv4.ipv6.ssl.weechat 9001 ---- diff --git a/po/cs.po b/po/cs.po index cf65a57e5..be35ea2c8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:58+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -9126,6 +9126,10 @@ msgstr "Klienti pro přenos:" msgid "Listening on ports:" msgstr "Poslouchám na portech:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " port %s%d%s, přesměrování: %s%s.%s%s, spuštěno v: %s" + #, fuzzy, c-format msgid " port %s%d%s, relay: %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" @@ -9150,8 +9154,8 @@ msgstr "ovládání přesměrování" #, fuzzy msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" "list|listfull|listrelay || add || del " "|| raw" @@ -9161,8 +9165,18 @@ msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -9171,10 +9185,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/de.po b/po/de.po index 6fe4f172a..61a770a35 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 21:20+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -10227,6 +10227,10 @@ msgstr "keine Verbindung zum Client für Relay" msgid "Listening on ports:" msgstr "Lausche an Ports:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " Port %s%d%s, Relay: %s%s%s, %s, gestartet am: %s" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr " Port %s%d%s, Relay: %s%s%s, %s, gestartet am: %s" @@ -10249,19 +10253,31 @@ msgstr "%s%s: Relay \"%s\" nicht gefunden" msgid "relay control" msgstr "Relay-Kontrolle" +#, fuzzy msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " "del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +#, fuzzy msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -10270,10 +10286,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/es.po b/po/es.po index 003548c8a..20f3dc065 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:58+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -9408,6 +9408,10 @@ msgstr "Ningún cliente conectado para retransmitir" msgid "Listening on ports:" msgstr "Escuchando en los puertos:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " puerto %s%d%s, repetidor: %s%s%s, %s, iniciado en: %s" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr " puerto %s%d%s, repetidor: %s%s%s, %s, iniciado en: %s" @@ -9432,8 +9436,8 @@ msgstr "control de retransmisión" #, fuzzy msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" "list|listfull|listrelay || add || del || raw || sslcertkey" @@ -9443,8 +9447,18 @@ msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -9453,10 +9467,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/fr.po b/po/fr.po index 55e771ba3..f562f2300 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" -"PO-Revision-Date: 2014-11-01 20:33+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" +"PO-Revision-Date: 2014-11-02 11:10+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -9998,6 +9998,10 @@ msgstr "Pas de client connecté pour le relai" msgid "Listening on ports:" msgstr "Écoute sur les ports :" +#, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " port %s%d%s, relai : %s%s%s, %s (non démarré)" + #, 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" @@ -10021,18 +10025,28 @@ msgid "relay control" msgstr "contrôle du relai" msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || raw " +"|| sslcertkey" msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -10041,10 +10055,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" @@ -10066,11 +10081,21 @@ msgid "" " weechat protocol with SSL, using IPv4 + IPv6:\n" " /relay add ipv4.ipv6.ssl.weechat 9001" msgstr "" -" list : lister les clients pour le relai\n" -" listfull : lister les clients pour le relai (verbeux)\n" -" listrelay : lister les relais (nom et port)\n" -" add : ajouter un relai pour un protocole + nom\n" -" del : supprimer un relai pour un protocole + nom\n" +" list : lister les clients pour le relai\n" +" listfull : lister les clients pour le relai (verbeux)\n" +" listrelay : lister les relais (nom et port)\n" +" add : ajouter un relai (écouter sur un port)\n" +" del : supprimer un relai (les clients restent connectés)\n" +" stop : fermer le socket serveur (les clients restent connectés)\n" +" restart : fermer le socket serveur et écouter à nouveau sur le port (les " +"clients restent connectés)\n" +" nom : nom du relai (voir le format ci-dessous)\n" +" port : port utilisé pour le relai\n" +" raw : ouvrir le tampon avec les données brutes Relay\n" +"sslcertkey : définir le certificat/clé SSL en utilisant le chemin de " +"l'option relay.network.ssl_cert_key\n" +"\n" +"Le nom du relai est : [ipv4.][ipv6.][ssl.]\n" " ipv4 : forcer l'utilisation d'IPv4\n" " ipv6 : forcer l'utilisation d'IPv6\n" " ssl : activer SSL\n" @@ -10079,10 +10104,11 @@ msgstr "" "(optionnel, si non donné, le nom de serveur doit être envoyé par le client " "dans la commande \"PASS\", avec le format : \"PASS serveur:motdepasse\")\n" " - protocole \"weechat\" (le nom n'est pas utilisé)\n" -" port : port utilisé pour le relai\n" -" raw : ouvrir le tampon avec les données brutes Relay\n" -" sslcertkey : définir le certificat/clé SSL en utilisant le chemin de " -"l'option relay.network.ssl_cert_key\n" +"\n" +"Le protocole \"irc\" permet à n'importe quel client IRC (incluant WeeChat " +"lui-même) de se connecter sur le port.\n" +"Le protocole \"weechat\" permet à une interface distante de se connecter sur " +"le port, voir la liste ici : http://weechat.org/download/\n" "\n" "Sans paramètre, cette commande ouvre le tampon avec la liste des clients " "pour le relai.\n" diff --git a/po/hu.po b/po/hu.po index 6b4c94dbf..f035640e7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:58+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -8514,6 +8514,10 @@ msgstr "Nincs szerver.\n" msgid "Listening on ports:" msgstr "Aliaszok listája:\n" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr "%s%s%s távol: %s\n" + #, fuzzy, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr "%s%s%s távol: %s\n" @@ -8538,16 +8542,26 @@ msgid "relay control" msgstr "" msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -8556,10 +8570,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/it.po b/po/it.po index 3b8a89df9..e188939e3 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:58+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -9565,6 +9565,10 @@ msgstr "Nessun client connesso per il relay" msgid "Listening on ports:" msgstr "In ascolto sulle porte:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " porta %s%d%s, relay: %s%s%s, %s, avviato il: %s" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr " porta %s%d%s, relay: %s%s%s, %s, avviato il: %s" @@ -9587,19 +9591,31 @@ msgstr "%s%s: relay \"%s\" non trovato" msgid "relay control" msgstr "controllo relay" +#, fuzzy msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] " "|| del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +#, fuzzy msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -9608,10 +9624,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/ja.po b/po/ja.po index 78ee55135..4d1aa9269 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:58+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -9618,6 +9618,10 @@ msgstr "リレーするクライアントはありません" msgid "Listening on ports:" msgstr "リッスンポート:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " ポート %s%d%s、リレー: %s%s%s, %s、開始日時: %s" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr " ポート %s%d%s、リレー: %s%s%s, %s、開始日時: %s" @@ -9640,19 +9644,31 @@ msgstr "%s%s: リレー \"%s\" が見つかりません" msgid "relay control" msgstr "リレー管理" +#, fuzzy msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " "del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +#, fuzzy msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -9661,10 +9677,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/pl.po b/po/pl.po index c6cb38bd6..f2ae8b324 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:58+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -9803,6 +9803,10 @@ msgstr "Brak klientów do przekazywania" msgid "Listening on ports:" msgstr "Nasłuchuję na portach:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " port %s%d%s, relay:%s%s%s, %s, rozpoczęto: %s" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr " port %s%d%s, relay:%s%s%s, %s, rozpoczęto: %s" @@ -9825,19 +9829,31 @@ msgstr "%s%s: relay \"%s\" nie został znaleziony" msgid "relay control" msgstr "zarządzanie przesyłaniem" +#, fuzzy msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] " "|| del [ipv4.][ipv6.][ssl.] || raw || kluczSSL" +#, fuzzy msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -9846,10 +9862,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ef5b3b5ab..57eb58059 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:59+0100\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -8787,6 +8787,10 @@ msgstr "Clientes para relay:" msgid "Listening on ports:" msgstr "Escutando nas portas:" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr " porta %s%d%s, relay: %s%s.%s%s, iniciado em: %s" + #, fuzzy, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr " porta %s%d%s, relay: %s%s.%s%s, iniciado em: %s" @@ -8810,16 +8814,26 @@ msgid "relay control" msgstr "" msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -8828,10 +8842,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/ru.po b/po/ru.po index bfd2c0e21..e01f4a58f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-11-01 11:59+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -8542,6 +8542,10 @@ msgstr "Нет сервера.\n" msgid "Listening on ports:" msgstr "Список сокращений:\n" +#, fuzzy, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr "%s%s%s отсутствует: %s\n" + #, fuzzy, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr "%s%s%s отсутствует: %s\n" @@ -8566,16 +8570,26 @@ msgid "relay control" msgstr "" msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -8584,10 +8598,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/tr.po b/po/tr.po index d6e39abd3..a169801f0 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-07-25 07:50+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -7665,6 +7665,10 @@ msgstr "" msgid "Listening on ports:" msgstr "" +#, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr "" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr "" @@ -7688,16 +7692,26 @@ msgid "relay control" msgstr "" msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -7706,10 +7720,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/po/weechat.pot b/po/weechat.pot index 3feff3150..557f32601 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-11-01 20:32+0100\n" +"POT-Creation-Date: 2014-11-02 11:09+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -7605,6 +7605,10 @@ msgstr "" msgid "Listening on ports:" msgstr "" +#, c-format +msgid " port %s%d%s, relay: %s%s%s, %s (not started)" +msgstr "" + #, c-format msgid " port %s%d%s, relay: %s%s%s, %s, started on: %s" msgstr "" @@ -7628,16 +7632,26 @@ msgid "relay control" msgstr "" msgid "" -"list|listfull|listrelay || add [ipv4.][ipv6.][ssl.] || " -"del [ipv4.][ipv6.][ssl.] || raw || sslcertkey" +"list|listfull|listrelay || add || del|stop|restart || " +"raw || sslcertkey" msgstr "" msgid "" " list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" -" add: add relay for a protocol + name\n" -" del: remove relay for a protocol + name\n" +" add: add a relay (listen on a port)\n" +" del: remove a relay (clients remain connected)\n" +" stop: close the server socket (clients remain connected)\n" +" restart: close the server socket and listen again on port (clients " +"remain connected)\n" +" name: relay name (see format below)\n" +" port: port used for relay\n" +" raw: open buffer with raw Relay data\n" +" sslcertkey: set SSL certificate/key using path in option relay.network." +"ssl_cert_key\n" +"\n" +"Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -7646,10 +7660,11 @@ msgid "" "if not given, the server name must be sent by client in command \"PASS\", " "with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" -" port: port used for relay\n" -" raw: open buffer with raw Relay data\n" -" sslcertkey: set SSL certificate/key using path in option relay.network." -"ssl_cert_key\n" +"\n" +"The \"irc\" protocol allows any IRC client (including WeeChat itself) to " +"connect on the port.\n" +"The \"weechat\" protocol allows a remote interface to connect on the port, " +"see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay clients.\n" "\n" diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c index 664c65748..fb4432394 100644 --- a/src/plugins/relay/relay-command.c +++ b/src/plugins/relay/relay-command.c @@ -137,24 +137,40 @@ relay_command_server_list () for (ptr_server = relay_servers; ptr_server; ptr_server = ptr_server->next_server) { - date_start[0] = '\0'; - date_tmp = localtime (&(ptr_server->start_time)); - if (date_tmp) + if (ptr_server->sock < 0) { - strftime (date_start, sizeof (date_start), - "%a, %d %b %Y %H:%M:%S", date_tmp); + weechat_printf ( + NULL, + _(" port %s%d%s, relay: %s%s%s, %s (not started)"), + RELAY_COLOR_CHAT_BUFFER, + ptr_server->port, + RELAY_COLOR_CHAT, + RELAY_COLOR_CHAT_BUFFER, + ptr_server->protocol_string, + RELAY_COLOR_CHAT, + ((ptr_server->ipv4 && ptr_server->ipv6) ? "IPv4+6" : ((ptr_server->ipv6) ? "IPv6" : "IPv4"))); + } + else + { + date_start[0] = '\0'; + date_tmp = localtime (&(ptr_server->start_time)); + if (date_tmp) + { + strftime (date_start, sizeof (date_start), + "%a, %d %b %Y %H:%M:%S", date_tmp); + } + weechat_printf ( + NULL, + _(" port %s%d%s, relay: %s%s%s, %s, started on: %s"), + RELAY_COLOR_CHAT_BUFFER, + ptr_server->port, + RELAY_COLOR_CHAT, + RELAY_COLOR_CHAT_BUFFER, + ptr_server->protocol_string, + RELAY_COLOR_CHAT, + ((ptr_server->ipv4 && ptr_server->ipv6) ? "IPv4+6" : ((ptr_server->ipv6) ? "IPv6" : "IPv4")), + date_start); } - - weechat_printf (NULL, - _(" port %s%d%s, relay: %s%s%s, %s, started on: %s"), - RELAY_COLOR_CHAT_BUFFER, - ptr_server->port, - RELAY_COLOR_CHAT, - RELAY_COLOR_CHAT_BUFFER, - ptr_server->protocol_string, - RELAY_COLOR_CHAT, - ((ptr_server->ipv4 && ptr_server->ipv6) ? "IPv4+6" : ((ptr_server->ipv6) ? "IPv6" : "IPv4")), - date_start); i++; } } @@ -246,6 +262,47 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } + if (weechat_strcasecmp (argv[1], "stop") == 0) + { + if (argc < 3) + return WEECHAT_RC_ERROR; + ptr_server = relay_server_search (argv_eol[2]); + if (ptr_server) + { + relay_server_close_socket (ptr_server); + } + else + { + weechat_printf (NULL, + _("%s%s: relay \"%s\" not found"), + weechat_prefix ("error"), + RELAY_PLUGIN_NAME, + argv_eol[2]); + } + return WEECHAT_RC_OK; + } + + if (weechat_strcasecmp (argv[1], "restart") == 0) + { + if (argc < 3) + return WEECHAT_RC_ERROR; + ptr_server = relay_server_search (argv_eol[2]); + if (ptr_server) + { + relay_server_close_socket (ptr_server); + relay_server_create_socket (ptr_server); + } + else + { + weechat_printf (NULL, + _("%s%s: relay \"%s\" not found"), + weechat_prefix ("error"), + RELAY_PLUGIN_NAME, + argv_eol[2]); + } + return WEECHAT_RC_OK; + } + if (weechat_strcasecmp (argv[1], "raw") == 0) { relay_raw_open (1); @@ -299,15 +356,25 @@ relay_command_init () "relay", N_("relay control"), N_("list|listfull|listrelay" - " || add [ipv4.][ipv6.][ssl.] " - " || del [ipv4.][ipv6.][ssl.]" + " || add " + " || del|stop|restart " " || raw" " || sslcertkey"), N_(" list: list relay clients (only active relays)\n" " listfull: list relay clients (verbose, all relays)\n" " listrelay: list relays (name and port)\n" - " add: add relay for a protocol + name\n" - " del: remove relay for a protocol + name\n" + " add: add a relay (listen on a port)\n" + " del: remove a relay (clients remain connected)\n" + " stop: close the server socket (clients remain connected)\n" + " restart: close the server socket and listen again on port " + "(clients remain connected)\n" + " name: relay name (see format below)\n" + " port: port used for relay\n" + " raw: open buffer with raw Relay data\n" + " sslcertkey: set SSL certificate/key using path in option " + "relay.network.ssl_cert_key\n" + "\n" + "Relay name is: [ipv4.][ipv6.][ssl.]\n" " ipv4: force use of IPv4\n" " ipv6: force use of IPv6\n" " ssl: enable SSL\n" @@ -316,10 +383,11 @@ relay_command_init () "(optional, if not given, the server name must be sent by client in " "command \"PASS\", with format: \"PASS server:password\")\n" " - protocol \"weechat\" (name is not used)\n" - " port: port used for relay\n" - " raw: open buffer with raw Relay data\n" - " sslcertkey: set SSL certificate/key using path in option " - "relay.network.ssl_cert_key\n" + "\n" + "The \"irc\" protocol allows any IRC client (including WeeChat " + "itself) to connect on the port.\n" + "The \"weechat\" protocol allows a remote interface to connect on " + "the port, see the list here: http://weechat.org/download/\n" "\n" "Without argument, this command opens buffer with list of relay " "clients.\n" @@ -346,6 +414,8 @@ relay_command_init () " || listrelay" " || add %(relay_protocol_name) %(relay_free_port)" " || del %(relay_relays)" + " || stop %(relay_relays)" + " || restart %(relay_relays)" " || raw" " || sslcertkey", &relay_command_relay, NULL); diff --git a/src/plugins/relay/relay-server.c b/src/plugins/relay/relay-server.c index a75b623fd..11481f962 100644 --- a/src/plugins/relay/relay-server.c +++ b/src/plugins/relay/relay-server.c @@ -546,15 +546,7 @@ relay_server_new (const char *protocol_string, enum t_relay_protocol protocol, new_server->start_time = 0; new_server->last_client_disconnect = 0; - if (!relay_server_create_socket (new_server)) - { - if (new_server->protocol_string) - free (new_server->protocol_string); - if (new_server->protocol_args) - free (new_server->protocol_args); - free (new_server); - return NULL; - } + relay_server_create_socket (new_server); new_server->prev_server = NULL; new_server->next_server = relay_servers;