summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-06-08 12:32:09 +0200
committerSebastien Helleu <flashcode@flashtux.org>2013-06-08 12:32:09 +0200
commit950287d38516cf66183d1ce53b7dd1050cacac42 (patch)
tree083c98ede008aca0164dad4937659b8827779f04
parent21356d9909bd6da1c39b15bac88189fe5826b3f7 (diff)
downloadweechat-950287d38516cf66183d1ce53b7dd1050cacac42.zip
irc: display a warning when the proxy set in a server does not exist
-rw-r--r--doc/de/autogen/user/irc_options.txt2
-rw-r--r--doc/en/autogen/user/irc_options.txt2
-rw-r--r--doc/fr/autogen/user/irc_options.txt2
-rw-r--r--doc/it/autogen/user/irc_options.txt2
-rw-r--r--doc/ja/autogen/user/irc_options.txt2
-rw-r--r--po/cs.po20
-rw-r--r--po/de.po218
-rw-r--r--po/es.po20
-rw-r--r--po/fr.po20
-rw-r--r--po/hu.po18
-rw-r--r--po/it.po20
-rw-r--r--po/ja.po19
-rw-r--r--po/pl.po20
-rw-r--r--po/pt_BR.po20
-rw-r--r--po/ru.po18
-rw-r--r--po/weechat.pot12
-rw-r--r--src/plugins/irc/irc-config.c37
17 files changed, 171 insertions, 281 deletions
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index ec6468c4f..c91cd4a42 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -494,7 +494,7 @@
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** Beschreibung: `Proxy, der für diesen Server verwendet wird (optional)`
+** Beschreibung: `name of proxy used for this server (optional, proxy must be defined with command /proxy)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 5b01e573c..dd0d719cd 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -494,7 +494,7 @@
** values: any string (default value: `""`)
* [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** description: `proxy used for this server (optional)`
+** description: `name of proxy used for this server (optional, proxy must be defined with command /proxy)`
** type: string
** values: any string (default value: `""`)
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 8c2acc88d..ec3a9a8e8 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -494,7 +494,7 @@
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** description: `proxy utilisé pour ce serveur (optionnel)`
+** description: `nom du proxy utilisé pour ce serveur (optionnel, le proxy doit être défini avec la commande /proxy)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index 198263e61..0846818d8 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -494,7 +494,7 @@
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** descrizione: `proxy usato per il server (opzionale)`
+** descrizione: `name of proxy used for this server (optional, proxy must be defined with command /proxy)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index f1346430c..c7f58ab18 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -494,7 +494,7 @@
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** 説明: `このサーバに使われるプロキシ (オプション)`
+** 説明: `name of proxy used for this server (optional, proxy must be defined with command /proxy)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
diff --git a/po/cs.po b/po/cs.po
index ce1884882..caa7864f8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: cs\n"
@@ -5686,6 +5686,12 @@ msgstr "přezdívky v seznamu notifikací"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
"%s%s: nevalidní řetězec priorit, chyba je na této pozici v řetězci: \"%s\""
@@ -5727,8 +5733,10 @@ msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr ""
"seznam jmen hostů nebo IP adres (s porty) pro servery (oddělený čárkami)"
-msgid "proxy used for this server (optional)"
-msgstr "proxy použitá pro tento server (volitelné)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -9493,7 +9501,3 @@ msgstr ""
msgid "Constants"
msgstr ""
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "zobrazit speiální zprávy při změně dne"
diff --git a/po/de.po b/po/de.po
index 07d0ac619..49a0247cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
"Language: de_DE\n"
@@ -6224,6 +6224,12 @@ msgstr "Nicks für die eine Benachrichtigung existiert"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
"%s%s: ungültige Zeichenkette für Prioritäten, Fehler befindet sich an "
@@ -6269,8 +6275,10 @@ msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr ""
"Liste der Hostnamen/Ports oder IP/Ports des Servers (durch Komma getrennt)"
-msgid "proxy used for this server (optional)"
-msgstr "Proxy, der für diesen Server verwendet wird (optional)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -10387,205 +10395,3 @@ msgstr "Type"
msgid "Constants"
msgstr "Konstanten"
-
-#~ msgid "leaf: id: %d, parent: %d, plugin: \"%s\", buffer: \"%s\""
-#~ msgstr "Blatt: id: %d, Stamm: %d, Erweiterung: \"%s\", Buffer: \"%s\""
-
-#~ msgid "node: id: %d, parent: %d, child1: %d, child2: %d, size: %d%% (%s)"
-#~ msgstr "Node: id: %d, Stamm: %d, Kind1: %d, Kind2: %d, Größe: %d%% (%s)"
-
-#~ msgid "horizontal split"
-#~ msgstr "horizontale Aufteilung"
-
-#~ msgid "vertical split"
-#~ msgstr "vertikale Aufteilung"
-
-#~ msgid "Saved layout for windows:"
-#~ msgstr "gespeicherte Layouts für Fenster:"
-
-#~ msgid "Layout saved for buffers (order of buffers)"
-#~ msgstr "Layout der Buffer gesichert (Reihenfolge der Buffer)"
-
-#~ msgid "Layout saved for windows (buffer displayed by each window)"
-#~ msgstr ""
-#~ "Layout der Fenster gesichert (Buffer werden durch jedes Fenster "
-#~ "dargestellt)"
-
-#~ msgid "Layout reset for buffers"
-#~ msgstr "Zurücksetzen des Bufferlayouts"
-
-#~ msgid "Layout reset for windows"
-#~ msgstr "Zurücksetzen des Fensterlayouts"
-
-#~ msgid "hide password displayed by nickserv"
-#~ msgstr "Passwörter verstecken die durch NickServ angezeigt werden"
-
-#~ 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"
-
-#~ 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"
diff --git a/po/es.po b/po/es.po
index 0113e44bf..bd8bfd784 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: es\n"
@@ -5899,6 +5899,12 @@ msgstr "apodos en la lista de notificación"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
"%s%s: cadena de prioridades inválida, error a esta posición de la cadena: "
@@ -5940,8 +5946,10 @@ msgstr "%s%s: error al crear CTCP \"%s\" => \"%s\""
msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr "lista de dirección/puerto para el servidor (separados por comas)"
-msgid "proxy used for this server (optional)"
-msgstr "proxy usado por este servidor (opcional)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -9742,7 +9750,3 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Constantes"
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "mostrar un mensaje especial cuando el día cambia"
diff --git a/po/fr.po b/po/fr.po
index 62c4ada1c..1f401d35b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-06-08 11:29+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -6069,6 +6069,14 @@ msgstr "pseudos dans la liste de notifications"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+"%s%s: attention: le proxy \"%s\" n'existe pas (vous pouvez le créer avec la "
+"commande /proxy)"
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
"%s%s: chaîne de priorités invalide, erreur à cette position dans la chaîne : "
@@ -6112,8 +6120,12 @@ msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr ""
"liste de nom/port ou IP/port pour le serveur (séparés par des virgules)"
-msgid "proxy used for this server (optional)"
-msgstr "proxy utilisé pour ce serveur (optionnel)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
+"nom du proxy utilisé pour ce serveur (optionnel, le proxy doit être défini "
+"avec la commande /proxy)"
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
diff --git a/po/hu.po b/po/hu.po
index e09b40a28..b682c219c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: hu\n"
@@ -5258,6 +5258,12 @@ msgstr "%s nem található ilyen mellőzés\n"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
@@ -5290,7 +5296,9 @@ msgstr "%s nincs elég memória az információs pult üzenethez\n"
msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr "felhasználónév az IRC szerveren"
-msgid "proxy used for this server (optional)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
msgstr ""
msgid ""
@@ -8955,7 +8963,3 @@ msgstr ""
msgid "Constants"
msgstr ""
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "speciális üzenet az aktuális nap megváltozásakor"
diff --git a/po/it.po b/po/it.po
index 6fb8eda34..498e0a07f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: it\n"
@@ -5968,6 +5968,12 @@ msgstr "nick nella lista notifiche"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
"%s%s: stringa delle proprietà non valida, errore in questa posizione: \"%s\""
@@ -6008,8 +6014,10 @@ msgstr "%s%s: errore nella creazione del CTCP \"%s\" => \"%s\""
msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr "elenco di host/porte o IP/porte per il server (separati da virgole)"
-msgid "proxy used for this server (optional)"
-msgstr "proxy usato per il server (opzionale)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -9832,7 +9840,3 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Costanti"
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "mostra un messaggio speciale al cambio di data"
diff --git a/po/ja.po b/po/ja.po
index a1e9d5213..75eda5b11 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
"Language: ja\n"
@@ -5870,6 +5870,12 @@ msgstr "通知エントリのニックネーム"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr "%s%s: 不正なプロパティ文字列、文字列のエラーの位置: \"%s\""
@@ -5909,8 +5915,10 @@ msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr ""
"サーバのホスト名/ポート番号又は IP アドレス/ポート番号のリスト (コンマ区切り)"
-msgid "proxy used for this server (optional)"
-msgstr "このサーバに使われるプロキシ (オプション)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -9788,6 +9796,3 @@ msgstr "タイプ"
msgid "Constants"
msgstr "定数"
-
-#~ msgid "%s: script \"%s\" is now autoloaded"
-#~ msgstr "%s: スクリプト \"%s\" は現在自動ロードされています"
diff --git a/po/pl.po b/po/pl.po
index 44278f8ff..740fcf80a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:54+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: pl\n"
@@ -5984,6 +5984,12 @@ msgstr "nicki na liście powiadomień"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr "%s%s: nieprawidłowy ciąg priorytetów, błąd na pozycji: \"%s\""
@@ -6023,8 +6029,10 @@ msgstr "%s%s: błąd podczas tworzenia CTCP \"%s\" => \"%s\""
msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr "lista host/port lub adres IP/port dla serwera (oddzielone przecinkiem)"
-msgid "proxy used for this server (optional)"
-msgstr "proxy użyte dla tego serwera (opcjonalne)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -9947,7 +9955,3 @@ msgstr "Typ"
msgid "Constants"
msgstr "Stałe"
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "wyświetlaj specjalną wiadomość, kiedy zmienia się dzień"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 51b0da57c..43365273a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:55+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: pt_BR\n"
@@ -5426,6 +5426,12 @@ msgstr "apelidos na lista de notificação"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
"%s%s: string de prioridades inválida, erro nesta posição da string: \"%s\""
@@ -5467,8 +5473,10 @@ msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr ""
"lista de hostname/porta ou IP/porta para o servidor (separados por vírgula)"
-msgid "proxy used for this server (optional)"
-msgstr "proxy utilizado para este servidor (opcional)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
+msgstr ""
msgid ""
"use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); "
@@ -9122,7 +9130,3 @@ msgstr ""
msgid "Constants"
msgstr ""
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "mostra uma mensagem especial quando o dia muda"
diff --git a/po/ru.po b/po/ru.po
index 531abd319..c9e7af865 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-06-08 11:29+0200\n"
-"PO-Revision-Date: 2013-05-20 16:55+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\n"
+"PO-Revision-Date: 2013-06-08 12:30+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: ru\n"
@@ -5282,6 +5282,12 @@ msgstr "%s игнорирования не найдены\n"
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
@@ -5314,7 +5320,9 @@ msgstr "%s недостаточно памяти для сообщения в с
msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr "ник, используемый на IRC сервере"
-msgid "proxy used for this server (optional)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
msgstr ""
msgid ""
@@ -8973,7 +8981,3 @@ msgstr ""
msgid "Constants"
msgstr ""
-
-#, fuzzy
-#~ msgid "display names when joining channel"
-#~ msgstr "отображать специальное сообщение при смене дня"
diff --git a/po/weechat.pot b/po/weechat.pot
index 3ace4fabf..5939367a4 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -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-06-08 11:29+0200\n"
+"POT-Creation-Date: 2013-06-08 12:28+0200\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"
@@ -4576,6 +4576,12 @@ msgstr ""
#, c-format
msgid ""
+"%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
+"proxy)"
+msgstr ""
+
+#, c-format
+msgid ""
"%s%s: invalid priorities string, error at this position in string: \"%s\""
msgstr ""
@@ -4607,7 +4613,9 @@ msgstr ""
msgid "list of hostname/port or IP/port for server (separated by comma)"
msgstr ""
-msgid "proxy used for this server (optional)"
+msgid ""
+"name of proxy used for this server (optional, proxy must be defined with "
+"command /proxy)"
msgstr ""
msgid ""
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 9deb40763..e0bf8d6e9 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -997,8 +997,9 @@ irc_config_server_check_value_cb (void *data,
struct t_config_option *option,
const char *value)
{
- int index_option;
- const char *pos_error;
+ int index_option, proxy_found;
+ const char *pos_error, *proxy_name;
+ struct t_infolist *infolist;
/* make C compiler happy */
(void) option;
@@ -1008,6 +1009,35 @@ irc_config_server_check_value_cb (void *data,
{
switch (index_option)
{
+ case IRC_SERVER_OPTION_PROXY:
+ if (value && value[0])
+ {
+ proxy_found = 0;
+ infolist = weechat_infolist_get ("proxy", NULL, value);
+ if (infolist)
+ {
+ while (weechat_infolist_next (infolist))
+ {
+ proxy_name = weechat_infolist_string (infolist, "name");
+ if (proxy_name && (strcmp (value, proxy_name) == 0))
+ {
+ proxy_found = 1;
+ break;
+ }
+ }
+ weechat_infolist_free (infolist);
+ }
+ if (!proxy_found)
+ {
+ weechat_printf (NULL,
+ _("%s%s: warning: proxy \"%s\" does not "
+ "exist (you can create it with command "
+ "/proxy)"),
+ weechat_prefix ("error"), IRC_PLUGIN_NAME,
+ value);
+ }
+ }
+ break;
case IRC_SERVER_OPTION_SSL_PRIORITIES:
pos_error = irc_config_check_gnutls_priorities (value);
if (pos_error)
@@ -1455,7 +1485,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
new_option = weechat_config_new_option (
config_file, section,
option_name, "string",
- N_("proxy used for this server (optional)"),
+ N_("name of proxy used for this server (optional, proxy must be "
+ "defined with command /proxy)"),
NULL, 0, 0,
default_value, value,
null_value_allowed,