relay: add support of multiple servers on same port for irc protocol (the client must send the server in the "PASS" command)

2026-06-30 14:56:39 +02:00 · 2013-02-23 08:33:38 +01:00
parent 6394a3d1e1
commit c17d3e155c
27 changed files with 529 additions and 851 deletions
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-02-20
+v0.4.1-dev, 2013-02-23


 This document lists all changes for each version.
@@ -40,6 +40,8 @@ Version 0.4.1 (under dev!)
 * irc: add color in output of /names when result is on server buffer (channel
  not joined) (bug #38070)
 * perl: simplify code to load scripts
+* relay: add support of multiple servers on same port for irc protocol (the
+  client must send the server in the "PASS" command)
 * relay: add websocket server support (RFC 6455) for irc and weechat protocols,
  new option relay.network.websocket_allowed_origins
 * relay: add options "buffers" and "upgrade" for commands sync/desync in weechat
@@ -5,7 +5,7 @@ div.sectionbody {
    font-family: serif,Helvetica,arial;
 }
 h1, h2, h3, h4, h5, h6 {
-  margin: 0.6em 0 0.6em 0;
+  margin: 1em 0 0.6em 0;
 }

 h5 {
@@ -7,37 +7,39 @@
        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": und der Name des Servers welcher geteilt werden soll
-                 - 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 relay for a protocol + name
+          del: remove relay for a protocol + name
+         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

-Ohne Angabe von Argumenten werden alle Relay-Clients in einem neuen Buffer dargestellt.
+Without argument, this command opens buffer with list of relay clients.

-Beispiele:
-  IRC Proxy für Server "freenode":
+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
-  WeeChat Protokoll:
+  irc proxy, for all servers (client will choose), with SSL:
+    /relay add ssl.irc 8002
+  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
 ........................................

@@ -2329,49 +2329,22 @@ Befehle

 include::autogen/user/relay_commands.txt[]

-[[relay_irc_proxy]]
-IRC proxy
-^^^^^^^^^
+// TRANSLATION MISSING
+[[relay_password]]
+Password
+^^^^^^^^

-Die Relay-Erweiterung verhält sich wie ein IRC Proxy: Es kann ein Port als IRC Server
-definiert und ein Passwort für Clients genutzt werden.
-
-Beispiel:
-
----------------------------------------
-/set relay.network.password "mein Passwort"
-/relay add irc.freenode 8000
----------------------------------------
-
-Nun kann mittels eines IRC Clients (WeeChat, XChat, irssi, ...) am Port 8000 und dem
-Server-Passwort "mein Passwort" eine Verbindung hergestellt werden.
-
-Die Anzahl an erlaubten Clients kann limitiert werden:
-
----------------------------------------
-/set relay.network.max_clients 1
----------------------------------------
-
-[[relay_weechat_protocol]]
-WeeChat Protokoll
-^^^^^^^^^^^^^^^^^
-
-Die Relay-Erweiterung kann Daten, mittels dem WeeChat Protokoll, an eine
-externe Oberfläche senden.
-
-Zum Beispiel:
+It is highly recommended to set a password for relay, with command:

 ----------------------------------------
 /set relay.network.password "meinPasswort"
-/relay add weechat 9000
 ----------------------------------------

-Nun kann man über den Port 9000 mittels einer Oberfläche (wie QWeeChat)
-und dem Passwort "meinPasswort" eine Verbindung zu WeeChat herstellen.
+This password is used for 'irc' and 'weechat' protocols.

 [[relay_ssl]]
-Relay-Verbindung mittels SSL
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+SSL
+^^^

 Man kann SSL mittels eines selbst erstellten Zertifikates und eines privaten
 Schlüssels nutzen. Um SSL für die Verbindung zu aktivieren stellt man dem
@@ -2396,16 +2369,58 @@ Schlüssel mittels folgendem Befehl nachträglich geladen werden:
 /relay sslcertkey
 ----------------------------------------

-um dann die Relay-Verbindung, mit SSL Verschlüsselung, anzulegen:
+// TRANSLATION MISSING
+[[relay_irc_proxy]]
+IRC proxy
+^^^^^^^^^
+
+The Relay plugin can act as an IRC proxy: it will simulate an IRC server, and
+you can connect to WeeChat with any other IRC client (including WeeChat itself).
+
+You can define one port by IRC server, or one generic port for all servers.
+
+When using one port for all servers, the client must send the internal name of
+server in the IRC "PASS" command, with this format:

 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS server:meinPasswort
 ----------------------------------------

+Example: IRC proxy with SSL for any server (client will choose):
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Example: IRC proxy without SSL only for server "freenode":
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Now you can connect on port 8000 with any IRC client using server password
+"meinPasswort" (or "freenode:meinPasswort" if no server was specified in the
+relay).
+
+[[relay_weechat_protocol]]
+WeeChat Protokoll
+^^^^^^^^^^^^^^^^^
+
+Die Relay-Erweiterung kann Daten, mittels dem WeeChat Protokoll, an eine
+externe Oberfläche senden.
+
+Zum Beispiel:
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+Nun kann man über den Port 9000 mittels einer Oberfläche und dem Passwort
+"meinPasswort" eine Verbindung zu WeeChat herstellen.
+
 // TRANSLATION MISSING
 [[relay_websocket]]
-Websocket
+WebSocket
 ^^^^^^^^^

 WebSocket protocol (http://tools.ietf.org/html/rfc6455[RFC 6455]) is supported
@@ -2420,11 +2435,11 @@ A WebSocket can be opened in a HTML5 with a single line of JavaScript:

 [source,js]
 ----------------------------------------
-websocket = new WebSocket("ws://server.com:5000/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----------------------------------------

-The port (5000 in example) is the port defined in Relay plugin.
-The URI must always ends with "/weechat" (for both IRC and WeeChat protocols).
+The port (9000 in example) is the port defined in Relay plugin.
+The URI must always end with "/weechat" (for 'irc' and 'weechat' protocols).

 [[rmodifier_plugin]]
 Rmodifier Erweiterung
@@ -16,7 +16,7 @@
         ipv6: force use of IPv6
          ssl: enable SSL
 protocol.name: protocol and name to relay:
-                 - protocol "irc": name is the server to share
+                 - 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
@@ -29,6 +29,8 @@ Examples:
    /relay add irc.freenode 8000
  irc proxy, for server "freenode", with SSL:
    /relay add ssl.irc.freenode 8001
+  irc proxy, for all servers (client will choose), with SSL:
+    /relay add ssl.irc 8002
  weechat protocol:
    /relay add weechat 9000
  weechat protocol with SSL:
@@ -2269,7 +2269,7 @@ The Relay plugin is used to relay data via network, using different protocols:
 * 'irc': IRC proxy: used to share connections to IRC servers with one or many
  other IRC clients
 * 'weechat': protocol used by remote interfaces to display and interact with
-  WeeChat (for example QWeeChat)
+  WeeChat (for example QWeeChat or weechat-android)

 [[relay_options]]
 Options (relay.conf)
@@ -2283,48 +2283,21 @@ Commands

 include::autogen/user/relay_commands.txt[]

-[[relay_irc_proxy]]
-IRC proxy
-^^^^^^^^^
+[[relay_password]]
+Password
+^^^^^^^^

-The Relay plugin can act as an IRC proxy: you can define one port by IRC server
-and use a password for clients.
-
-For example:
+It is highly recommended to set a password for relay, with command:

 ----------------------------------------
 /set relay.network.password "mypass"
-/relay add irc.freenode 8000
 ----------------------------------------

-Now you can connect on port 8000 with any IRC client (WeeChat, xchat,
-irssi, ..), using server password "mypass".
-
-You can limit number of allowed clients:
-
----------------------------------------
-/set relay.network.max_clients 1
----------------------------------------
-
-[[relay_weechat_protocol]]
-WeeChat protocol
-^^^^^^^^^^^^^^^^
-
-The Relay plugin can send data to remote interface using WeeChat protocol.
-
-For example:
-
----------------------------------------
-/set relay.network.password "mypass"
-/relay add weechat 9000
----------------------------------------
-
-Now you can connect on port 9000 with a remote interface (like QWeeChat),
-using password "mypass".
+This password is used for 'irc' and 'weechat' protocols.

 [[relay_ssl]]
-Relay with SSL
-^^^^^^^^^^^^^^
+SSL
+^^^

 You can use SSL by creating a certificate and private key, and by using prefix
 "ssl." in the name of protocol.
@@ -2347,15 +2320,54 @@ with command:
 /relay sslcertkey
 ----------------------------------------

-And then add relay with SSL, for example:
+[[relay_irc_proxy]]
+IRC proxy
+^^^^^^^^^
+
+The Relay plugin can act as an IRC proxy: it will simulate an IRC server, and
+you can connect to WeeChat with any other IRC client (including WeeChat itself).
+
+You can define one port by IRC server, or one generic port for all servers.
+
+When using one port for all servers, the client must send the internal name of
+server in the IRC "PASS" command, with this format:

 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS server:password
 ----------------------------------------

+Example: IRC proxy with SSL for any server (client will choose):
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Example: IRC proxy without SSL only for server "freenode":
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Now you can connect on port 8000 with any IRC client using server password
+"mypass" (or "freenode:mypass" if no server was specified in the relay).
+
+[[relay_weechat_protocol]]
+WeeChat protocol
+^^^^^^^^^^^^^^^^
+
+The Relay plugin can send data to remote interface using WeeChat protocol.
+
+For example:
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+Now you can connect on port 9000 with a remote interface using password
+"mypass".
+
 [[relay_websocket]]
-Websocket
+WebSocket
 ^^^^^^^^^

 WebSocket protocol (http://tools.ietf.org/html/rfc6455[RFC 6455]) is supported
@@ -2370,11 +2382,11 @@ A WebSocket can be opened in a HTML5 with a single line of JavaScript:

 [source,js]
 ----------------------------------------
-websocket = new WebSocket("ws://server.com:5000/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----------------------------------------

-The port (5000 in example) is the port defined in Relay plugin.
-The URI must always ends with "/weechat" (for both IRC and WeeChat protocols).
+The port (9000 in example) is the port defined in Relay plugin.
+The URI must always end with "/weechat" (for 'irc' and 'weechat' protocols).

 [[rmodifier_plugin]]
 Rmodifier plugin
@@ -16,7 +16,7 @@
         ipv6: forcer l'utilisation d'IPv6
          ssl: activer SSL
 protocole.nom: protocole et nom à relayer:
-                 - protocole "irc": le nom est le serveur à partager
+                 - 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
@@ -29,6 +29,8 @@ Exemples:
    /relay add irc.freenode 8000
  proxy irc, pour le serveur "freenode", avec SSL:
    /relay add ssl.irc.freenode 8001
+  proxy irc, pour tous les serveurs (le client choisira), avec SSL:
+    /relay add ssl.irc 8002
  protocole weechat:
    /relay add weechat 9000
  protocole weechat avec SSL:
@@ -2341,7 +2341,7 @@ utilisant divers protocoles :
 * 'irc' : proxy IRC : utilisé pour partager la connexions aux serveurs IRC avec
  un ou plusieurs autres clients IRC
 * 'weechat' : protocole utilisé par les interfaces distantes (par exemple
-  QWeeChat).
+  QWeeChat ou weechat-android).

 [[relay_options]]
 Options (relay.conf)
@@ -2355,50 +2355,22 @@ Commandes

 include::autogen/user/relay_commands.txt[]

-[[relay_irc_proxy]]
-IRC proxy
-^^^^^^^^^
+[[relay_password]]
+Mot de passe
+^^^^^^^^^^^^

-L'extension Relay peut agir comme un proxy IRC : vous pouvez définir un port
-par serveur IRC et utiliser un mot de passe pour les clients.
-
-Par exemple :
+Il est fortement recommandé de définir un mot de passe pour le relai, avec la
+commande :

 ----------------------------------------
-/set relay.network.password "mypass"
-/relay add irc.freenode 8000
+/set relay.network.password "motdepasse"
 ----------------------------------------

-Maintenant vous pouvez vous connecter sur le port 8000 avec n'importe quel
-client IRC (WeeChat, xchat, irssi, etc...), en utilisant le mot de passe
-"mypass".
-
-Vous pouvez limiter le nombre de clients autorisés :
-
----------------------------------------
-/set relay.network.max_clients 1
----------------------------------------
-
-[[relay_weechat_protocol]]
-Protocole WeeChat
-^^^^^^^^^^^^^^^^^
-
-L'extension Relay peut envoyer les données à une interface distante en
-utilisant le protocole WeeChat.
-
-Par exemple :
-
----------------------------------------
-/set relay.network.password "mypass"
-/relay add weechat 9000
----------------------------------------
-
-Maintenant vous pouvez vous connecter sur le port 9000 avec une interface
-distante (comme QWeeChat), en utilisant le mot de passe "mypass".
+Ce mot de passe sera utilisé pour les protocoles 'irc' et 'weechat'.

 [[relay_ssl]]
-Relai avec SSL
-^^^^^^^^^^^^^^
+SSL
+^^^

 Vous pouvez utiliser SSL en créant un certificat et clé privée et en utilisant
 le préfixe "ssl." dans le nom du protocole.
@@ -2421,15 +2393,58 @@ commande :
 /relay sslcertkey
 ----------------------------------------

-Et ajoutez le relai avec SSL, par exemple :
+[[relay_irc_proxy]]
+IRC proxy
+^^^^^^^^^
+
+L'extension Relay peut agir comme un proxy IRC : elle simulera un serveur IRC,
+et vous pourrez vous connecter sur WeeChat avec n'importe quel autre client IRC
+(y compris WeeChat lui-même).
+
+Vous pouvez définir un port par serveur IRC, ou bien un port générique pour tous
+les serveurs.
+
+Lors de l'utilisation d'un port pour tous les serveurs, le client doit envoyer
+le nom interne du serveur dans la commande IRC "PASS", avec le format :

 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS serveur:motdepasse
 ----------------------------------------

+Exemple : proxy IRC avec SSL pour tout serveur (le client choisira) :
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Exemple : proxy IRC sans SSL seulement pour le serveur "freenode" :
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Maintenant vous pouvez vous connecter sur le port 8000 avec n'importe quel
+client IRC en utilisant le mot de passe "motdepasse" (ou "freenode:motdepasse"
+si aucun serveur n'a été spécifié dans le relai).
+
+[[relay_weechat_protocol]]
+Protocole WeeChat
+^^^^^^^^^^^^^^^^^
+
+L'extension Relay peut envoyer les données à une interface distante en
+utilisant le protocole WeeChat.
+
+Par exemple :
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+Maintenant vous pouvez vous connecter sur le port 9000 avec une interface
+distante en utilisant le mot de passe "motdepasse".
+
 [[relay_websocket]]
-Websocket
+WebSocket
 ^^^^^^^^^

 Le protocole WebSocket (http://tools.ietf.org/html/rfc6455[RFC 6455]) est
@@ -2445,12 +2460,12 @@ JavaScript :

 [source,js]
 ----------------------------------------
-websocket = new WebSocket("ws://server.com:5000/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----------------------------------------

-Le port (5000 dans l'exemple) est le port défini dans l'extension Relay.
-L'URI doit toujours se terminer par "/weechat" (pour les protocoles IRC et
-WeeChat).
+Le port (9000 dans l'exemple) est le port défini dans l'extension Relay.
+L'URI doit toujours se terminer par "/weechat" (pour les protocoles 'irc' et
+'weechat').

 [[rmodifier_plugin]]
 Extension Rmodifier
@@ -16,7 +16,7 @@
         ipv6: force use of IPv6
          ssl: enable SSL
 protocol.name: protocol and name to relay:
-                 - protocol "irc": name is the server to share
+                 - 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
@@ -29,6 +29,8 @@ Examples:
    /relay add irc.freenode 8000
  irc proxy, for server "freenode", with SSL:
    /relay add ssl.irc.freenode 8001
+  irc proxy, for all servers (client will choose), with SSL:
+    /relay add ssl.irc 8002
  weechat protocol:
    /relay add weechat 9000
  weechat protocol with SSL:
@@ -2344,49 +2344,22 @@ Comandi

 include::autogen/user/relay_commands.txt[]

-[[relay_irc_proxy]]
-Proxy IRC
-^^^^^^^^^
+// TRANSLATION MISSING
+[[relay_password]]
+Password
+^^^^^^^^

-Il plugin Relay può funzionare come un proxy IRC: è possibile definire una porta
-per il server IRC ed utilizzare una password per i client.
-
-Ad esempio:
+It is highly recommended to set a password for relay, with command:

 ----------------------------------------
 /set relay.network.password "miapass"
-/relay add irc.freenode 8000
 ----------------------------------------

-Ora è possibile connettersi sulla porta 8000 con qualsiasi client IRC
-(WeeChat, xchat, irssi, ..) utilizzando la password del server "miapass".
-
-È possibile inoltre limitare il numero di client consentiti:
-
----------------------------------------
-/set relay.network.max_clients 1
----------------------------------------
-
-[[relay_weechat_protocol]]
-Protocollo WeeChat
-^^^^^^^^^^^^^^^^^^
-
-Il plugin Relay può inviare dati alle interfacce remote usando il protocollo
-WeeChat.
-
-Ad esempio:
-
----------------------------------------
-/set relay.network.password "miapass"
-/relay add weechat 9000
----------------------------------------
-
-Ora è possibile connettersi sulla porta 9000 con un'interfaccia remota
-(come QWeeChat) usando la password "miapass".
+This password is used for 'irc' and 'weechat' protocols.

 [[relay_ssl]]
-Relay con SSL
-^^^^^^^^^^^^^
+SSL
+^^^

 È possibile usare SSL creando un certificato e una chiave privata, e usando il
 prefisso "ssl." nel nome del protocollo.
@@ -2409,16 +2382,57 @@ chiave privata con il comando:
 /relay sslcertkey
 ----------------------------------------

-E poi aggiungere il relay con SSL, ad esempio:
+// TRANSLATION MISSING
+[[relay_irc_proxy]]
+Proxy IRC
+^^^^^^^^^
+
+The Relay plugin can act as an IRC proxy: it will simulate an IRC server, and
+you can connect to WeeChat with any other IRC client (including WeeChat itself).
+
+You can define one port by IRC server, or one generic port for all servers.
+
+When using one port for all servers, the client must send the internal name of
+server in the IRC "PASS" command, with this format:

 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS server:miapass
 ----------------------------------------

+Example: IRC proxy with SSL for any server (client will choose):
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Example: IRC proxy without SSL only for server "freenode":
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Now you can connect on port 8000 with any IRC client using server password
+"miapass" (or "freenode:miapass" if no server was specified in the relay).
+
+[[relay_weechat_protocol]]
+Protocollo WeeChat
+^^^^^^^^^^^^^^^^^^
+
+Il plugin Relay può inviare dati alle interfacce remote usando il protocollo
+WeeChat.
+
+Ad esempio:
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+Ora è possibile connettersi sulla porta 9000 con un'interfaccia remota usando la
+password "miapass".
+
 // TRANSLATION MISSING
 [[relay_websocket]]
-Websocket
+WebSocket
 ^^^^^^^^^

 WebSocket protocol (http://tools.ietf.org/html/rfc6455[RFC 6455]) is supported
@@ -2433,11 +2447,11 @@ A WebSocket can be opened in a HTML5 with a single line of JavaScript:

 [source,js]
 ----------------------------------------
-websocket = new WebSocket("ws://server.com:5000/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----------------------------------------

-The port (5000 in example) is the port defined in Relay plugin.
-The URI must always ends with "/weechat" (for both IRC and WeeChat protocols).
+The port (9000 in example) is the port defined in Relay plugin.
+The URI must always end with "/weechat" (for 'irc' and 'weechat' protocols).

 [[rmodifier_plugin]]
 Plugin Rmodifier
@@ -7,37 +7,39 @@
        raw
        sslcertkey

-         list: リレーするクライアントをリストアップ (アクティブなもののみ)
-     listfull: リレーするクライアントをリストアップ (詳細、全てのリレー)
-    listrelay: リレーをリストアップ (名前とポート番号)
-          add: プロトコル + 名前のリレーを追加
-          del: プロトコル + 名前のリレーを削除
-         ipv4: IPv4 を強制的に利用
-         ipv6: IPv6 を強制的に利用
-          ssl: SSL を有効化
-protocol.name: リレーするプロトコルと名前:
-                 - プロトコル "irc": 名前は共有するサーバ
-                 - プロトコル "weechat" (名前は使われていない)
-         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 relay for a protocol + name
+          del: remove relay for a protocol + name
+         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

-引数無しの場合、リレークライアントのリストを含むバッファを開く
+Without argument, this command opens buffer with list of relay clients.

-例:
-  サーバ "freenode" に対する irc プロキシを設定:
+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
-  weechat プロトコル:
+  irc proxy, for all servers (client will choose), with SSL:
+    /relay add ssl.irc 8002
+  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
 ........................................

@@ -2202,45 +2202,21 @@ include::autogen/user/relay_options.txt[]

 include::autogen/user/relay_commands.txt[]

-[[relay_irc_proxy]]
-==== IRC プロキシ ====
+// TRANSLATION MISSING
+[[relay_password]]
+Password
+^^^^^^^^

-Relay プラグインは IRC プロキシにもなります。IRC サーバ用にポートを設定して、
-クライアントからの接続に必要なパスワードを設定することができます。
-
-例:
+It is highly recommended to set a password for relay, with command:

 ----------------------------------------
 /set relay.network.password "mypass"
-/relay add irc.freenode 8000
 ----------------------------------------

-この後、適当な IRC クライアント (WeeChat、xchat、irssi、..) を使って 8000
-番ポートに対して、サーバパスワード "mypass" で接続することができます。
-
-クライアントの数を制限することも可能です:
-
----------------------------------------
-/set relay.network.max_clients 1
----------------------------------------
-
-[[relay_weechat_protocol]]
-==== WeeChat プロトコル ====
-
-Relay プラグインは WeeChat プロトコルを使ってリモートインターフェイスに対してデータを送信できます。
-
-例:
-
----------------------------------------
-/set relay.network.password "mypass"
-/relay add weechat 9000
----------------------------------------
-
-この後、リモートインターフェイス (QWeeChat 等) を使って 9000
-番ポートに対して、パスワード "mypass" で接続することができます。
+This password is used for 'irc' and 'weechat' protocols.

 [[relay_ssl]]
-==== SSL 経由のリレー ====
+==== SSL ====

 証明書と秘密鍵を作り、プロトコル名の最初に "ssl." を付けることで
 SSL 経由でリレーを利用することができます。
@@ -2263,16 +2239,54 @@ WeeChat が既に起動している場合、
 /relay sslcertkey
 ----------------------------------------

-この後に SSL 経由のリレーを追加します、例えば:
+// TRANSLATION MISSING
+[[relay_irc_proxy]]
+==== IRC プロキシ ====
+
+The Relay plugin can act as an IRC proxy: it will simulate an IRC server, and
+you can connect to WeeChat with any other IRC client (including WeeChat itself).
+
+You can define one port by IRC server, or one generic port for all servers.
+
+When using one port for all servers, the client must send the internal name of
+server in the IRC "PASS" command, with this format:

 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS server:mypass
 ----------------------------------------

+Example: IRC proxy with SSL for any server (client will choose):
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Example: IRC proxy without SSL only for server "freenode":
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Now you can connect on port 8000 with any IRC client using server password
+"mypass" (or "freenode:mypass" if no server was specified in the relay).
+
+[[relay_weechat_protocol]]
+==== WeeChat プロトコル ====
+
+Relay プラグインは WeeChat プロトコルを使ってリモートインターフェイスに対してデータを送信できます。
+
+例:
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+この後、リモートインターフェイスを使って 9000
+番ポートに対して、パスワード "mypass" で接続することができます。
+
 // TRANSLATION MISSING
 [[relay_websocket]]
-Websocket
+WebSocket
 ^^^^^^^^^

 WebSocket protocol (http://tools.ietf.org/html/rfc6455[RFC 6455]) is supported
@@ -2287,11 +2301,11 @@ A WebSocket can be opened in a HTML5 with a single line of JavaScript:

 [source,js]
 ----------------------------------------
-websocket = new WebSocket("ws://server.com:5000/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----------------------------------------

-The port (5000 in example) is the port defined in Relay plugin.
-The URI must always ends with "/weechat" (for both IRC and WeeChat protocols).
+The port (9000 in example) is the port defined in Relay plugin.
+The URI must always end with "/weechat" (for 'irc' and 'weechat' protocols).

 [[rmodifier_plugin]]
 === Rmodifier プラグイン ===
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:07+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:54+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Czech\n"
@@ -3464,12 +3464,6 @@ msgstr "Filtrování zpráv zakázáno"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', velikost: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "server"
-msgstr[1] "servery"
-msgstr[2] "serverů"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4136,6 +4130,12 @@ msgstr "jméno FIFO roury"
 msgid "away"
 msgstr "pryč"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "server"
+msgstr[1] "servery"
+msgstr[2] "serverů"
+
 msgid "Lag"
 msgstr "Lag"

@@ -7813,7 +7813,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -7827,6 +7829,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -7883,10 +7887,6 @@ msgstr "%s%s: chyba: neznámý protokol \"%s\""
 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"
@@ -9347,35 +9347,3 @@ msgstr ""

 msgid "Constants"
 msgstr ""
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: nedostatek paměti pro vytvoření kontroly pravopisu"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s%s: nemohu nastavit nastavení sketu \"SO_REUSEADDR\""
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr "%s%s: nemohu nastavit nastavení soketu \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s%s: nemohu nastavit nastavení soketu \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: nemohu vytvořit soket pro xfer"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: nedostatek paměti pro parsování souboru \"%s\""
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: nemůžu spustit soubor \"%s\""
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: neznámá chyba při načítání souboru \"%s\""
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: chyba načítání skriptu \"%s\" (špatné jméno, mezery jsou zakázány)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s nemohu vytvořit soket"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:07+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
 "Language: \n"
@@ -3899,11 +3899,6 @@ msgstr "Maus ist deaktiviert"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', Größe: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "Server"
-msgstr[1] "Server"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4625,6 +4620,11 @@ msgstr "Name der FIFO-Pipe"
 msgid "away"
 msgstr "abwesend"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "Server"
+msgstr[1] "Server"
+
 msgid "Lag"
 msgstr "Lag"

@@ -8490,6 +8490,7 @@ msgstr ""
 "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.]<protocol.name> <port> || "
 "del [ipv4.][ipv6.][ssl.]<protocol.name> || raw || sslcertkey"

+#, fuzzy
 msgid ""
 "         list: list relay clients (only active relays)\n"
 "     listfull: list relay clients (verbose, all relays)\n"
@@ -8500,7 +8501,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -8514,6 +8517,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -8588,10 +8593,6 @@ msgstr "%s%s: Unbekanntes Protokoll \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: Fehler: dieser Name ist für das Protokoll \"%s\" nicht erlaubt"

-#, c-format
-msgid "%s%s: error: name is not required for protocol \"%s\""
-msgstr "%s%s: Fehler: ein Name ist für das Protokoll \"%s\" nicht notwendig"
-
 #, c-format
 msgid "%s%s: error: relay for \"%s\" already exists"
 msgstr "%s%s: Fehler: Relay für \"%s\" existiert bereits"
@@ -10205,170 +10206,3 @@ msgstr "Type"

 msgid "Constants"
 msgstr "Konstanten"
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: Nicht genug Speicher um neue Rechtschreibung zu erstellen"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s%s Fehler beim Erstellen der Socket-Option \"SO_REUSEADDR\""
-
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr ""
-#~ "%s%s der Wert %d kann nicht für die Socket-Option, \"IPV6_V6ONLY\", "
-#~ "gesetzt werden"
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s%s Fehler beim Erstellen der Socket-Option \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: Für den Transfer konnte kein Socket angelegt werden"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: Nicht genug Speicher um Datei \"%s\" zu analysieren"
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: Kann Datei \"%s\" nicht ausführen"
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: unbekannter Fehler beim Laden der Datei \"%s\""
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: Fehler beim Laden des Skriptes \"%s\" (fehlerhafter Name: Leerzeichen "
-#~ "sind nicht erlaubt)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s: Socket konnte nicht angelegt werden"
-
-#~ msgid "background color for window separators (when split)"
-#~ msgstr ""
-#~ "Hintergrundfarbe der Fenster-Separatoren im Chatfenster (bei geteiltem "
-#~ "Bildschirm)"
-
-#~ msgid "No configuration option found"
-#~ msgstr "Konfigurationsoption nicht gefunden"
-
-#~ msgid "%s%d%s configuration option found"
-#~ msgid_plural "%s%d%s configuration options found"
-#~ msgstr[0] "%s%d%s Konfigurationsoption gefunden"
-#~ msgstr[1] "%s%d%s Konfigurationsoptionen gefunden"
-
-#~ msgid "%sError: configuration option \"%s\" not found"
-#~ msgstr "%sFehler: Konfigurationsoption \"%s\" nicht gefunden"
-
-#~ msgid "[<option> [<value>]]"
-#~ msgstr "[<option> [<value>]]"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "Channels automatisch betreten, falls man rausgeworfen wurde"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "Präfix für Fehlermeldungen"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "Präfix für Netzwerkmeldungen"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "Präfix für Action-Nachrichten"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "Präfix für Join-Nachrichten"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "Präfix für Quit-Nachrichten"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "Bedingung(en) um eine Bar anzuzeigen (gilt für Bars des Typs \"window\"): "
-#~ "\"active\" = window muss aktiv sein \"inactive\" = window muss inaktiv "
-#~ "sein, \"nicklist\" = Buffer muss über eine Nickliste verfügen"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "server: Servername\n"
-#~ "  nick: Nickname (oder eine Maske)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "Server über IPv6 ansprechen"
-
-#~ msgid "global decoding charset"
-#~ msgstr "globaler Zeichensatz zum dekodieren"
-
-#~ msgid "global encoding charset"
-#~ msgstr "globaler Zeichensatz zum kodieren"
-
-#~ msgid "alt+d=back to list"
-#~ msgstr "alt+d=zurück zur Auswahl"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: Verbinden zum Server %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: Vom Server getrennt!"
-
-#~ msgid "display nick mode ((half)op/voice) before each nick"
-#~ msgstr ""
-#~ "vor dem Nicknamen wird der entsprechende Nickmode ((half)op/voice [@%+]) "
-#~ "angezeigt"
-
-#~ msgid "%s: script \"%s\" held"
-#~ msgstr "%s: Skript \"%s\" kann nicht überschrieben werden"
-
-#~ msgid ""
-#~ "%s%s: cannot authenticate with SASL and mechanism DH-BLOWFISH because "
-#~ "WeeChat was not built with libgcrypt support"
-#~ msgstr ""
-#~ "%s%s Authentifizierung mittels SASL und DH-BLOWFISH Mechanismus nicht "
-#~ "möglich, da WeeChat nicht mit libgcrypt Unterstützung erstellt wurde"
-
-#~ msgid "smart completion for nicks (completes first with last speakers)"
-#~ msgstr ""
-#~ "intelligente Vervollständigung von Nicknamen (vervollständigt zuerst den "
-#~ "letzten Nick, mit dem gesprochen wurde)"
-
-#~ msgid "ended on: "
-#~ msgstr "geendet am: "
-
-#~ msgid "%s%-26s id: %d, protocol: %s, received: %s, sent: %s"
-#~ msgstr "%s%-26s Id: %d, Protokoll: %s, empfangen: %s, gesendet: %s"
-
-#~ 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%s)"
-
-#~ msgid "text color"
-#~ msgstr "Textfarbe"
-
-#~ msgid "background color"
-#~ msgstr "Hintergrundfarbe"
-
-#~ msgid "text color of selected xfer line"
-#~ msgstr "Farbe der ausgewählten Transfer-Zeile"
-
-#~ msgid "display message when (un)marking as away"
-#~ msgstr "bei Abwesenheit und Rückkehr eine Nachricht anzeigen"
-
-#~ msgid "display channel modes in \"buffer_name\" bar item"
-#~ msgstr "zeigt die Channel-Modi mittels \"buffer_name\" in der Bar-Item an"
-
-#~ msgid "%sError: name can not start with \"#\""
-#~ msgstr "%sFehler: Name darf nicht mit \"#\"beginnen"
-
-#~ msgid "%s%s: name can not start with \"#\""
-#~ msgstr "%s%s: Name darf nicht mit \"#\" beginnen"
-
-#~ msgid "string inserted after nick completion"
-#~ msgstr "Nach Nick-Vervollständigung anzufügende Zeichenfolge"
-
-#~ msgid "display '+' if prefix is truncated"
-#~ msgstr "Anzeige eines '+' falls das Präfix abgeschnitten ist"
-
-#~ msgid "<nick> <channel>"
-#~ msgstr "<nick> <channel>"
-
-#~ msgid "mechanism for SASL authentication"
-#~ msgstr "Vorrichtung zur SASL Authentifizierung"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:07+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Spanish\n"
@@ -3656,11 +3656,6 @@ msgstr "Ratón desactivado"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', tamaño: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "servidor"
-msgstr[1] "servidores"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4332,6 +4327,11 @@ msgstr "nombre de la tubería FIFO"
 msgid "away"
 msgstr "ausente"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "servidor"
+msgstr[1] "servidores"
+
 msgid "Lag"
 msgstr "Retraso"

@@ -8057,7 +8057,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -8071,6 +8073,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -8139,10 +8143,6 @@ msgstr "%s%s: error: protocolo desconocido \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: error: nombre no es permitido para el protocolo \"%s\""

-#, c-format
-msgid "%s%s: error: name is not required for protocol \"%s\""
-msgstr "%s%s: error: nombre no es requerido para el protocolo \"%s\""
-
 #, c-format
 msgid "%s%s: error: relay for \"%s\" already exists"
 msgstr "%s%s: error: repetidor para \"%s\" ya existe"
@@ -9590,42 +9590,3 @@ msgstr "Tipo"

 msgid "Constants"
 msgstr "Constantes"
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: no hay suficiente memoria para crear el nuevo deletreador"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr ""
-#~ "%s%s: no ha sido posible configurar la opción del socket \"SO_REUSEADDR\""
-
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr ""
-#~ "%s%s: no ha sido posible configurar la opción del socket \"IPV6_V6ONLY\" "
-#~ "al valor %d"
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr ""
-#~ "%s%s: no ha sido posible configurar la opción del socket \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: no ha sido posible crear el socket para la transferencia"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: no hay suficiente memoria para analizar el archivo \"%s\""
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: no es posible ejecutar el archivo \"%s\""
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: error desconocido mientras se cargaba el archivo \"%s\""
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: error al cargar el script \"%s\" (nombre erróneo, los espacios no son "
-#~ "permitidos)"
-
-#~ msgid "background color for window separators (when split)"
-#~ msgstr "color de fondo para los separadores de ventana (cuando se dividen)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s: no ha sido posible crear el socket"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-02-17 12:18+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-23 08:23+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -3784,11 +3784,6 @@ msgstr "La souris est désactivée"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', taille: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "serveur"
-msgstr[1] "serveurs"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4493,6 +4488,11 @@ msgstr "nom du tube FIFO"
 msgid "away"
 msgstr "absent"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "serveur"
+msgstr[1] "serveurs"
+
 msgid "Lag"
 msgstr "Lag"

@@ -8278,7 +8278,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -8292,6 +8294,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -8312,7 +8316,9 @@ msgstr ""
 "         ipv6: forcer l'utilisation d'IPv6\n"
 "          ssl: activer SSL\n"
 "protocole.nom: protocole et nom à relayer:\n"
-"                 - protocole \"irc\": le nom est le serveur à partager\n"
+"                 - 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\")\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"
@@ -8327,6 +8333,8 @@ msgstr ""
 "    /relay add irc.freenode 8000\n"
 "  proxy irc, pour le serveur \"freenode\", avec SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  proxy irc, pour tous les serveurs (le client choisira), avec SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  protocole weechat:\n"
 "    /relay add weechat 9000\n"
 "  protocole weechat avec SSL:\n"
@@ -8365,10 +8373,6 @@ msgstr "%s%s: erreur: protocole \"%s\" inconnu"
 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à"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:07+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Hungarian\n"
@@ -3114,12 +3114,6 @@ msgstr "Nincs aliasz definiálva.\n"
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""

-#, fuzzy
-msgid "server"
-msgid_plural "servers"
-msgstr[0] "szerver"
-msgstr[1] "szerver"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -3747,6 +3741,12 @@ msgstr ""
 msgid "away"
 msgstr ""

+#, fuzzy
+msgid "server"
+msgid_plural "servers"
+msgstr[0] "szerver"
+msgstr[1] "szerver"
+
 msgid "Lag"
 msgstr ""

@@ -7306,7 +7306,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -7320,6 +7322,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -7360,10 +7364,6 @@ msgstr "%s ismeretlen billentyűparancs \"%s\"\n"
 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"
@@ -8823,39 +8823,3 @@ msgstr ""

 msgid "Constants"
 msgstr ""
-
-#, fuzzy
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s nincs elegendő memória új DCC számára\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s nem sikerült a \"SO_REUSEADDR\" csatornaopciót beállítani\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr "%s nem sikerült a \"SO_KEEPALIVE\" csatornaopciót beállítani\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s nem sikerült a \"SO_KEEPALIVE\" csatornaopciót beállítani\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s nem sikerült a csatornát létrehozni\n"
-
-#, fuzzy
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s nincs elegendő memória új DCC számára\n"
-
-#, fuzzy
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
-
-#, fuzzy
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s nem sikerült a csatornát létrehozni\n"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-02-03 12:13+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -3655,11 +3655,6 @@ msgstr "Mouse disabilitato"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', dimensione %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "server"
-msgstr[1] "server"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4344,6 +4339,11 @@ msgstr "nome della pipe FIFO"
 msgid "away"
 msgstr "assente"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "server"
+msgstr[1] "server"
+
 msgid "Lag"
 msgstr "Ritardo"

@@ -8074,7 +8074,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -8088,6 +8090,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -8162,10 +8166,6 @@ msgstr "%s%s: errore: protocollo \"%s\" sconosciuto"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: errore: nome non consentito per il protocollo \"%s\""

-#, c-format
-msgid "%s%s: error: name is not required for protocol \"%s\""
-msgstr "%s%s: errore: nome non richiesto per il protocollo \"%s\""
-
 #, c-format
 msgid "%s%s: error: relay for \"%s\" already exists"
 msgstr "%s%s: errore: il relay per \"%s\" esiste già"
@@ -9622,36 +9622,3 @@ msgstr "Tipo"

 msgid "Constants"
 msgstr "Costanti"
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: memoria non sufficiente per creare un nuovo correttore"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s%s: impossibile impostare l'opzione del socket \"SO_REUSEADDR\""
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr "%s%s: impossibile impostare l'opzione del socket \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s%s: impossibile impostare l'opzione del socket \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: impossibile creare il socker per xfer"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: memoria non sufficiente per analizzare il file \"%s\""
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: impossibile eseguire il file \"%s\""
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: errore sconosciuto durante la lettura del file \"%s\""
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: errore durante il caricamento dello script \"%s\" (nome errato, spazi "
-#~ "non ammessi)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s: impossibile creare il socket"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:07+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
 "Language: ja\n"
@@ -3641,10 +3641,6 @@ msgstr "マウスを無効化しました"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s'、サイズ: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "サーバ"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4324,6 +4320,10 @@ msgstr "FIFO パイプの名前"
 msgid "away"
 msgstr "離席"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "サーバ"
+
 msgid "Lag"
 msgstr "遅延時間"

@@ -7979,6 +7979,7 @@ msgstr ""
 "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.]<protocol.name> <port> || "
 "del [ipv4.][ipv6.][ssl.]<protocol.name> || raw || sslcertkey"

+#, fuzzy
 msgid ""
 "         list: list relay clients (only active relays)\n"
 "     listfull: list relay clients (verbose, all relays)\n"
@@ -7989,7 +7990,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -8003,6 +8006,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -8075,10 +8080,6 @@ msgstr "%s%s: エラー: 不明なプロトコル \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: エラー: プロトコル \"%s\" では name を使えません"

-#, c-format
-msgid "%s%s: error: name is not required for protocol \"%s\""
-msgstr "%s%s: エラー: プロトコル \"%s\" では name が必要です"
-
 #, c-format
 msgid "%s%s: error: relay for \"%s\" already exists"
 msgstr "%s%s: エラー: \"%s\" のリレーは既に存在しています。"
@@ -9607,36 +9608,3 @@ msgstr "タイプ"

 msgid "Constants"
 msgstr "定数"
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: 新しい speller を作る十分なメモリがありません"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s%s: ソケットオプション \"SO_REUSEADDR\" の設定に失敗"
-
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr ""
-#~ "%s%s: ソケットオプション \"IPV6_V6ONLY\" の値を %d に設定することはできま"
-#~ "せん"
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s%s: ソケットオプション \"SO_KEEPALIVE\" の設定に失敗"
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: xfer 用のソケットの作成に失敗"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: ファイル \"%s\" を解析する十分なメモリがありません"
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: ファイル \"%s\" を実行できません"
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: ファイル \"%s\" のロード中の未定義のエラー"
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: スクリプト \"%s\" のロード中にエラー (無効な名前、スペースは禁止)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s: ソケットの作成に失敗"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Polish\n"
@@ -3723,12 +3723,6 @@ msgstr "Obsługa myszy wyłączona"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', rozmiar: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "serwer"
-msgstr[1] "serwery"
-msgstr[2] "serwery"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4420,6 +4414,12 @@ msgstr "nazwa strumienia FIFO"
 msgid "away"
 msgstr "nieobecny"

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "serwer"
+msgstr[1] "serwery"
+msgstr[2] "serwery"
+
 msgid "Lag"
 msgstr "Lag"

@@ -8123,6 +8123,7 @@ msgstr ""
 "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.]<protokół.nazwa> <port> "
 "|| del [ipv4.][ipv6.][ssl.]<protokół.nazwa> || raw || kluczSSL"

+#, fuzzy
 msgid ""
 "         list: list relay clients (only active relays)\n"
 "     listfull: list relay clients (verbose, all relays)\n"
@@ -8133,7 +8134,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -8147,6 +8150,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -8219,10 +8224,6 @@ msgstr "%s%s: błąd: nieznany protokół \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: błąd: nie jest dozwolona dla protokołu \"%s\""

-#, c-format
-msgid "%s%s: error: name is not required for protocol \"%s\""
-msgstr "%s%s: błąd: nie jest wymagana przez protokół \"%s\""
-
 #, c-format
 msgid "%s%s: error: relay for \"%s\" already exists"
 msgstr "%s%s: błąd: relay dla \"%s\" już istnieje"
@@ -9761,35 +9762,3 @@ msgstr "Typ"

 msgid "Constants"
 msgstr "Stałe"
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: za mało pamięci na utworzenie nowego słownika"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s%s: nie można ustawić opcji gniazda \"SO_REUSEADDR\""
-
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr "%s%s: nie można ustawić opcji gniazda \"IPV6_V6ONLY\" na wartość %d"
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s%s: nie można ustawić opcji gniazda \"SO_KEEPALIVE\""
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: nie można utworzyć gniazda dla xfer"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: za mało pamięci do przetworzenia pliku \"%s\""
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: nie można wykonać pliku \"%s\""
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: nieznany błąd podczas ładowania pliku \"%s\""
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: błąd podczas ładowania skryptu \"%s\" (niewłaściwa nazwa, spacje są "
-#~ "zakazane)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s: nie można utworzyć gniazda"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Portuguese\n"
@@ -3546,11 +3546,6 @@ msgstr "Mouse está desabilitado"
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', tamanho: %dx%d"

-msgid "server"
-msgid_plural "servers"
-msgstr[0] "servidor"
-msgstr[1] "servidores"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -4172,6 +4167,11 @@ msgstr ""
 msgid "away"
 msgstr ""

+msgid "server"
+msgid_plural "servers"
+msgstr[0] "servidor"
+msgstr[1] "servidores"
+
 msgid "Lag"
 msgstr ""

@@ -7464,7 +7464,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -7478,6 +7480,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -7517,10 +7521,6 @@ msgstr "%s%s: erro: protocolo \"%s\" desconhecido"
 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 ""
@@ -8976,35 +8976,3 @@ msgstr ""

 msgid "Constants"
 msgstr ""
-
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s%s: memória insuficiente para criar novo verificador ortográfico"
-
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s%s: não foi possível setar opção \"SO_REUSEADDR\" para o socket"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr "%s%s: não foi possível setar opção \"SO_KEEPALIVE\" para o socket"
-
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s%s: não foi possível setar opção \"SO_KEEPALIVE\" para o socket"
-
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s%s: não foi possível criar socket para transferência"
-
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s%s: memória insuficiente para interpretar arquivo \"%s\""
-
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "%s%s: não foi possível executar arquivo \"%s\""
-
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "%s%s: erro desconhecido ao carregar arquivo \"%s\""
-
-#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-#~ msgstr ""
-#~ "%s: erro ao carregar script \"%s\" (nome inválido, espaços são proibidos)"
-
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s%s: não foi possível criar socket"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
-"PO-Revision-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
+"PO-Revision-Date: 2013-02-21 17:55+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Russian\n"
@@ -3141,13 +3141,6 @@ msgstr "Сокращения не заданы.\n"
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""

-#, fuzzy
-msgid "server"
-msgid_plural "servers"
-msgstr[0] "сервер"
-msgstr[1] "сервер"
-msgstr[2] "сервер"
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -3779,6 +3772,13 @@ msgstr ""
 msgid "away"
 msgstr ""

+#, fuzzy
+msgid "server"
+msgid_plural "servers"
+msgstr[0] "сервер"
+msgstr[1] "сервер"
+msgstr[2] "сервер"
+
 msgid "Lag"
 msgstr ""

@@ -7332,7 +7332,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -7346,6 +7348,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -7386,10 +7390,6 @@ msgstr "%s неизвестная функция клавиши \"%s\"\n"
 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"
@@ -8840,39 +8840,3 @@ msgstr ""

 msgid "Constants"
 msgstr ""
-
-#, fuzzy
-#~ msgid "%s%s: not enough memory to create new speller"
-#~ msgstr "%s недостаточно памяти для нового DCC\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
-#~ msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
-#~ msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
-#~ msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot create socket for xfer"
-#~ msgstr "%s невозможно создать сокет\n"
-
-#, fuzzy
-#~ msgid "%s%s: not enough memory to parse file \"%s\""
-#~ msgstr "%s недостаточно памяти для нового DCC\n"
-
-#, fuzzy
-#~ msgid "%s%s: unable to run file \"%s\""
-#~ msgstr "Не могу записать лог-файл \"%s\"\n"
-
-#, fuzzy
-#~ msgid "%s%s: unknown error while loading file \"%s\""
-#~ msgstr "Не могу записать лог-файл \"%s\"\n"
-
-#, fuzzy
-#~ msgid "%s%s: cannot create socket"
-#~ msgstr "%s невозможно создать сокет\n"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-02-17 12:17+0100\n"
+"POT-Creation-Date: 2013-02-23 08:23+0100\n"
 "PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2766,11 +2766,6 @@ msgstr ""
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""

-msgid "server"
-msgid_plural "servers"
-msgstr[0] ""
-msgstr[1] ""
-
 #, c-format
 msgid ""
 "%sUnable to change bar type: you must delete bar and create another to do "
@@ -3349,6 +3344,11 @@ msgstr ""
 msgid "away"
 msgstr ""

+msgid "server"
+msgid_plural "servers"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "Lag"
 msgstr ""

@@ -6451,7 +6451,9 @@ msgid ""
 "         ipv6: force use of IPv6\n"
 "          ssl: enable SSL\n"
 "protocol.name: protocol and name to relay:\n"
-"                 - protocol \"irc\": name is the server to share\n"
+"                 - 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\")\n"
 "                 - protocol \"weechat\" (name is not used)\n"
 "         port: port used for relay\n"
 "          raw: open buffer with raw Relay data\n"
@@ -6465,6 +6467,8 @@ msgid ""
 "    /relay add irc.freenode 8000\n"
 "  irc proxy, for server \"freenode\", with SSL:\n"
 "    /relay add ssl.irc.freenode 8001\n"
+"  irc proxy, for all servers (client will choose), with SSL:\n"
+"    /relay add ssl.irc 8002\n"
 "  weechat protocol:\n"
 "    /relay add weechat 9000\n"
 "  weechat protocol with SSL:\n"
@@ -6502,10 +6506,6 @@ msgstr ""
 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 ""
@@ -1149,6 +1149,10 @@ relay_irc_hook_signals (struct t_relay_client *client)
 {
    char str_signal_name[128];

+    /* do nothing if "protocol_args" (irc server name) is not yet initialized */
+    if (!client->protocol_args)
+        return;
+
    /*
     * hook signal "xxx,irc_in2_*" to catch IRC data received from
     * this server
@@ -1292,10 +1296,10 @@ void
 relay_irc_recv (struct t_relay_client *client, const char *data)
 {
    char str_time[128], str_signal[128], str_server_channel[256];
-    char str_command[128], *target, **irc_argv;
+    char str_command[128], *target, **irc_argv, *pos;
    const char *irc_command, *irc_channel, *irc_args, *irc_args2;
    int irc_argc, redirect_msg;
-    const char *nick, *irc_is_channel, *isupport, *info;
+    const char *nick, *irc_is_channel, *isupport, *info, *pos_password;
    struct t_hashtable *hash_parsed, *hash_redirect;
    struct t_infolist *infolist_server;

@@ -1348,11 +1352,23 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
    {
        if (irc_command && (weechat_strcasecmp (irc_command, "pass") == 0))
        {
-            if (!RELAY_IRC_DATA(client, password_ok))
+            if (irc_args && irc_args[0])
            {
-                if (irc_args && irc_args[0]
+                pos_password = (irc_args[0] == ':') ? irc_args + 1 : irc_args;
+                if (!client->protocol_args)
+                {
+                    pos = strchr (pos_password, ':');
+                    if (pos)
+                    {
+                        client->protocol_args = weechat_strndup (pos_password,
+                                                                 pos - pos_password);
+                        relay_client_set_desc (client);
+                        pos_password = pos + 1;
+                    }
+                }
+                if (!RELAY_IRC_DATA(client, password_ok)
                    && (strcmp (weechat_config_string (relay_config_network_password),
-                                (irc_args[0] == ':') ? irc_args + 1 : irc_args) == 0))
+                                pos_password) == 0))
                {
                    RELAY_IRC_DATA(client, password_ok) = 1;
                }
@@ -1360,6 +1376,21 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
        }
        if (irc_command && (weechat_strcasecmp (irc_command, "user") == 0))
        {
+            /* check if server is known */
+            if (!client->protocol_args)
+            {
+                relay_irc_sendf (client,
+                                 ":%s ERROR :WeeChat: server not specified, "
+                                 "command \"PASS server:password\" not received",
+                                 RELAY_IRC_DATA(client, address));
+                relay_irc_sendf (client,
+                                 ":%s ERROR :Closing Link",
+                                 RELAY_IRC_DATA(client, address));
+                relay_client_set_status (client,
+                                         RELAY_STATUS_DISCONNECTED);
+                goto end;
+            }
+
            /* check if connection to server is ok */
            infolist_server = weechat_infolist_get ("irc_server", NULL,
                                                    client->protocol_args);
@@ -113,6 +113,7 @@ extern int relay_client_count;
 extern int relay_client_valid (struct t_relay_client *client);
 extern struct t_relay_client *relay_client_search_by_number (int number);
 extern struct t_relay_client *relay_client_search_by_id (int id);
+extern void relay_client_set_desc (struct t_relay_client *client);
 extern int relay_client_recv_cb (void *arg_client, int fd);
 extern int relay_client_send (struct t_relay_client *client, const char *data,
                              int data_size, const char *message_raw_buffer);
@@ -326,7 +326,9 @@ relay_command_init ()
                             "          ssl: enable SSL\n"
                             "protocol.name: protocol and name to relay:\n"
                             "                 - protocol \"irc\": name is the "
-                             "server to share\n"
+                             "server to share (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"
@@ -340,6 +342,9 @@ relay_command_init ()
                             "    /relay add irc.freenode 8000\n"
                             "  irc proxy, for server \"freenode\", with SSL:\n"
                             "    /relay add ssl.irc.freenode 8001\n"
+                             "  irc proxy, for all servers (client will choose), "
+                             "with SSL:\n"
+                             "    /relay add ssl.irc 8002\n"
                             "  weechat protocol:\n"
                             "    /relay add weechat 9000\n"
                             "  weechat protocol with SSL:\n"
@@ -397,14 +397,6 @@ relay_config_create_option_port (void *data,
                            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)