diff --git a/po/cs.po b/po/cs.po index aac150874..814cfc0ba 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:12+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:22+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -103,7 +103,12 @@ msgstr "" "%s selhalo zjednání spojení s proxy serverem (zkontrolujte uživatelské jméno " "a heslo pokud jsou vyžadovány)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -111,57 +116,57 @@ msgstr "" "%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou " "GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: připojuji se k serveru %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Připojuji se k serveru %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s chyba inicializace gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s nemohu vytvořit rouru\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s nemohu vytvořit soket\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s nemohu nastavit nastavení sketu \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s nemohu nastavit nastavení soketu \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Připojuji se znovu k serveru...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Odpojen od serveru!\n" @@ -1392,63 +1397,59 @@ msgstr "sekund" msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "neznámý" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: používám jméno hosta \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nemohu najít přezdívku pro poslání zprávy\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s špatné parametry pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" není validní regulární výraz (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nedostatek paměti pro regulární výraz\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu nebo soukromého " "rozhovoru\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1456,12 +1457,12 @@ msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompilováno na %s %s\n" @@ -2000,6 +2001,10 @@ msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" "%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "neznámý" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Čekám" diff --git a/po/de.po b/po/de.po index 078095720..528d719cc 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:09+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:22+0200\n" "Last-Translator: Thomas Schütz \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -104,7 +104,12 @@ msgstr "" "%s Der Proxy konnte die Verbindung zum Server nicht aufbauen (bitte " "Benutzername/Passwort überprüfen)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -112,57 +117,57 @@ msgstr "" "%s SSL-Verbindung nicht möglich, da WeeChat nicht mit GNUtls-Support " "kompiliert wurde\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: verbinden zu Server %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "verbinden zu Server %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s gnutls Initialisierungsfehler\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s Pipe konnte nicht angelegt werden\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s Socket konnte nicht angelegt werden\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s Fehler beim Setzen der Socketoption \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s Fehler beim Setzen der Socketoption \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Neuverbinden zum Server...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Vom Server getrennt!\n" @@ -1389,64 +1394,60 @@ msgstr "Sekunden" msgid "(hidden)" msgstr "(versteckt)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "unbekannt" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: benutze lokalen Hostnamen \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" "%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s der \"%s\"-Befehl kann nur in Channelfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s der \"%s\"-Befehl kann nicht in Serverfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" ist kein korrekter regulärer Ausdruck (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nicht genügend Speicher für regulären Ausdruck vorhanden\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern " "ausgeführt werden\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1454,12 +1455,12 @@ msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompiliert auf %s %s\n" @@ -1999,6 +2000,10 @@ msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" "%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "unbekannt" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "warten" diff --git a/po/es.po b/po/es.po index bf23d14b1..949b213bb 100644 --- a/po/es.po +++ b/po/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:17+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -104,7 +104,12 @@ msgstr "" "%s el proxy ha fallado al establecer la conexin al servidor (comprueba el " "nombre de usuario o la contrasea si es necesario)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -112,57 +117,57 @@ msgstr "" "%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado " "con soporte GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: conectando al servidor %s:%d%s%s va %s proxy %s: %d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Conectando al servidor %s:%d%s%s va %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: conectando al servidor %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Conectando al servidor %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s error de inicializacin de gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s no ha sido posible crear la interconexin\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s no ha sido posible crear el socket\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s no ha sido posible configurar la opcin socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s no ha sido posible configurar la opcin socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconectando al servidor...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Desconectado del servidor!\n" @@ -1407,63 +1412,59 @@ msgstr "segundos" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "desconocido" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, fuzzy, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilizacin del nombre de mquina local \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrectos para el comando \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, fuzzy, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s no hay suficiente memoria para atar la clave\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1471,12 +1472,12 @@ msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" @@ -2038,6 +2039,10 @@ msgstr "" "%s: el nombre de usuario \"%s\" ya est en uso, probando con el 1 nombre de " "usuario \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "desconocido" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Esperando" diff --git a/po/fr.po b/po/fr.po index dbc8b1dae..e5a63f82e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:12+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -104,7 +104,12 @@ msgstr "" "%s le proxy n'a pas pu se connecter au serveur (vrifiez l'utilisateur/mot " "de passe si utiliss)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "%s impossible de paramtrer le nom/IP local\n" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -112,57 +117,57 @@ msgstr "" "%s impossible de se connecter en SSL car WeeChat n'a pas t construit avec " "le support GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: connexion au serveur %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Connexion au serveur %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s erreur d'initialisation gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de crer le pipe\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s impossible de crer la socket\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s impossible de paramtrer l'option socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s impossible de paramtrer l'option socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconnexion au serveur...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Dconnect du serveur !\n" @@ -1398,65 +1403,61 @@ msgstr "secondes" msgid "(hidden)" msgstr "(cach)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "inconnu" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" "%s la commande \"%s\" ne peut pas tre excute dans un tampon serveur\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramtres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" n'est pas une expression rgulire valide (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s pas assez de mmoire pour l'expression rgulire\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal ou " "priv\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s pseudo \"%s\" non trouv pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1464,12 +1465,12 @@ msgstr "%s pseudo \"%s\" non trouv msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s impossible de crer le tampon priv \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compil le %s %s\n" @@ -2012,6 +2013,10 @@ msgstr "" "%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 1er " "nom d'utilisateur \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "inconnu" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Attente" diff --git a/po/hu.po b/po/hu.po index 1eda3b5d5..de6df5915 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:14+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -108,7 +108,12 @@ msgstr "" "%s a proxy kiszolgálónak nem sikerült a szerverhez csatlakoznia (ellenőrizze " "a felhasználónevet/jelszót ha be van állítva)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -116,61 +121,61 @@ msgstr "" "%s nem sikerült SSL használattal kapcsolódni, mert a WeeChat GNUtls " "támogatás nélkül lett fordítva\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" "%s: csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:" "%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" "Csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:%d%" "s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Csatlakozás a(z) %s:%d%s%s szerverhez...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s gnutls inicializációs hiba\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s nem sikerült a csövet(pipe) létrehozni\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s nem sikerült a csatornát létrehozni\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s nem sikerült a \"SO_REUSEADDR\" csatornaopciót beállítani\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s nem sikerült a \"SO_KEEPALIVE\" csatornaopciót beállítani\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Újracsatlakozás a szerverhez...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Lekapcsolódott a szerverről!\n" @@ -1408,61 +1413,57 @@ msgstr "másodperc" msgid "(hidden)" msgstr "(rejtett)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "ismeretlen" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, fuzzy, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: helyi hosztnév \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nem található név az üzenet küldéséhez\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s rossz argumentum a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, fuzzy, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nincs elég memória a HOME könyvtárhoz\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1470,12 +1471,12 @@ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, lefordítva: %s %s\n" @@ -2020,6 +2021,10 @@ msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n" msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "ismeretlen" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Várakozás" diff --git a/po/ru.po b/po/ru.po index 32c6aa43f..cf8553f90 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-10 16:17+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: Stalwart \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -106,7 +106,12 @@ msgstr "" "%s proxy-сервер не смог установить соединение с сервером (проверьте имя " "пользователя и пароль если они используются)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -114,57 +119,57 @@ msgstr "" "%s невозможно соединиться с использованием SSL, так как WeeChat собран без " "поддержки GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: подключение к серверу %s:%d%s%s через %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Подключаюсь к серверу %s:%d%s%s через %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Подключаюсь к серверу %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s ошибка инициализации gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s не могу создать pipe\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s невозможно создать сокет\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Повторное соединение...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Отключен от сервера!\n" @@ -1392,62 +1397,58 @@ msgstr "секунды" msgid "(hidden)" msgstr "(скрытый)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "неизвестный" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: используется хост \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s не могу найти адресата сообщения\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s некорректные аргументы команды \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" не является регулярным выражением (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s недостаточно памяти для регулярного выражения\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" команда может быть выполнена только в буфере канала или привата\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1455,12 +1456,12 @@ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s некорректное количество аргументов команды \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, собран %s %s\n" @@ -1994,6 +1995,10 @@ msgstr "%s: все предложеные ники заняты, отключа msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "неизвестный" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Ожидание" diff --git a/po/weechat.pot b/po/weechat.pot index be1b8b69f..63c4b8fff 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,63 +102,68 @@ msgid "" "used)\n" msgstr "" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" msgstr "" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "" @@ -1288,61 +1293,57 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1350,12 +1351,12 @@ msgstr "" msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1888,6 +1889,10 @@ msgstr "" msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "" diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c index 9d09b9d58..b54346eb6 100644 --- a/src/irc/irc-send.c +++ b/src/irc/irc-send.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -49,31 +50,26 @@ void irc_login (t_irc_server *server) { - char hostname[128], *ptr_hostname; - + char hostname[NI_MAXHOST]; + if ((server->password) && (server->password[0])) server_sendf (server, "PASS %s\r\n", server->password); - if (server->hostname && server->hostname[0]) - ptr_hostname = server->hostname; - else - { - gethostname (hostname, sizeof (hostname) - 1); - hostname[sizeof (hostname) - 1] = '\0'; - if (!hostname[0]) - strcpy (hostname, _("unknown")); - ptr_hostname = hostname; - } + gethostname (hostname, sizeof (hostname) - 1); + hostname[sizeof (hostname) - 1] = '\0'; + if (!hostname[0]) + snprintf (hostname, NI_MAXHOST, "unknown"); + irc_display_prefix (server, server->buffer, PREFIX_INFO); gui_printf (server->buffer, _("%s: using hostname \"%s\"\n"), - PACKAGE_NAME, ptr_hostname); + PACKAGE_NAME, hostname); if (!server->nick) server->nick = strdup (server->nick1); server_sendf (server, "NICK %s\r\n" "USER %s %s %s :%s\r\n", - server->nick, server->username, ptr_hostname, "servername", + server->nick, server->username, hostname, "servername", server->realname); gui_input_draw (gui_current_window->buffer, 1); } diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index 09b97100a..685979c2d 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -981,51 +981,60 @@ server_child_read (t_irc_server *server) /* adress not found */ case '1': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - if (cfg_proxy_use) - gui_printf (server->buffer, - _("%s proxy address \"%s\" not found\n"), - WEECHAT_ERROR, server->address); - else - gui_printf (server->buffer, - _("%s address \"%s\" not found\n"), - WEECHAT_ERROR, server->address); + if (cfg_proxy_use) + gui_printf (server->buffer, + _("%s proxy address \"%s\" not found\n"), + WEECHAT_ERROR, server->address); + else + gui_printf (server->buffer, + _("%s address \"%s\" not found\n"), + WEECHAT_ERROR, server->address); server_close_connection (server); server_reconnect_schedule (server); break; /* IP address not found */ case '2': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - if (cfg_proxy_use) - gui_printf (server->buffer, - _("%s proxy IP address not found\n"), WEECHAT_ERROR); - else - gui_printf (server->buffer, - _("%s IP address not found\n"), WEECHAT_ERROR); + if (cfg_proxy_use) + gui_printf (server->buffer, + _("%s proxy IP address not found\n"), WEECHAT_ERROR); + else + gui_printf (server->buffer, + _("%s IP address not found\n"), WEECHAT_ERROR); server_close_connection (server); server_reconnect_schedule (server); break; - /* connection refused */ + /* connection refused */ case '3': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - if (cfg_proxy_use) - gui_printf (server->buffer, - _("%s proxy connection refused\n"), WEECHAT_ERROR); - else - gui_printf (server->buffer, - _("%s connection refused\n"), WEECHAT_ERROR); + if (cfg_proxy_use) + gui_printf (server->buffer, + _("%s proxy connection refused\n"), WEECHAT_ERROR); + else + gui_printf (server->buffer, + _("%s connection refused\n"), WEECHAT_ERROR); server_close_connection (server); server_reconnect_schedule (server); break; - /* proxy fails to connect to server */ + /* proxy fails to connect to server */ case '4': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s proxy fails to establish connection to " + gui_printf (server->buffer, + _("%s proxy fails to establish connection to " "server (check username/password if used)\n"), WEECHAT_ERROR); server_close_connection (server); server_reconnect_schedule (server); break; + /* fails to set local hostname/IP */ + case '5': + irc_display_prefix (server, server->buffer, PREFIX_ERROR); + gui_printf (server->buffer, + _("%s unable to set local hostname/IP\n"), + WEECHAT_ERROR); + server_close_connection (server); + server_reconnect_schedule (server); + break; } } } @@ -1393,90 +1402,128 @@ pass_proxy (int sock, char *address, int port, char *username) int server_child (t_irc_server *server) { - struct addrinfo hints, *res; + struct addrinfo hints, *res, *res_local; + int rc; res = NULL; + res_local = NULL; if (cfg_proxy_use) { - memset (&hints, 0, sizeof (hints)); - hints.ai_family = (cfg_proxy_ipv6) ? AF_INET6 : AF_INET; - hints.ai_socktype = SOCK_STREAM; - if (getaddrinfo (cfg_proxy_address, NULL, &hints, &res) !=0) + /* get info about server */ + memset (&hints, 0, sizeof (hints)); + hints.ai_family = (cfg_proxy_ipv6) ? AF_INET6 : AF_INET; + hints.ai_socktype = SOCK_STREAM; + if (getaddrinfo (cfg_proxy_address, NULL, &hints, &res) !=0) { - write(server->child_write, "1", 1); - return 0; + write(server->child_write, "1", 1); + return 0; } if (!res) { write(server->child_write, "1", 1); - return 0; + return 0; } - if ((cfg_proxy_ipv6 && (res->ai_family != AF_INET6)) - || ((!cfg_proxy_ipv6 && (res->ai_family != AF_INET)))) + if ((cfg_proxy_ipv6 && (res->ai_family != AF_INET6)) + || ((!cfg_proxy_ipv6 && (res->ai_family != AF_INET)))) { - write (server->child_write, "2", 1); + write (server->child_write, "2", 1); freeaddrinfo (res); - return 0; + return 0; } - if (cfg_proxy_ipv6) + if (cfg_proxy_ipv6) ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (cfg_proxy_port); - else + else ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (cfg_proxy_port); - - if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) + + /* connect to server */ + if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) { - write(server->child_write, "3", 1); + write(server->child_write, "3", 1); freeaddrinfo (res); - return 0; + return 0; } - - if (pass_proxy(server->sock, server->address, server->port, server->username)) + + if (pass_proxy(server->sock, server->address, server->port, server->username)) { - write(server->child_write, "4", 1); + write(server->child_write, "4", 1); freeaddrinfo (res); - return 0; + return 0; } } else { - memset (&hints, 0, sizeof(hints)); - hints.ai_family = (server->ipv6) ? AF_INET6 : AF_INET; - hints.ai_socktype = SOCK_STREAM; - if (getaddrinfo (server->address, NULL, &hints, &res) !=0) + /* set local hostname/IP if asked by user */ + if (server->hostname && server->hostname[0]) { - write(server->child_write, "1", 1); - return 0; - } - if (!res) - { - write(server->child_write, "1", 1); - return 0; - } - if ((server->ipv6 && (res->ai_family != AF_INET6)) - || ((!server->ipv6 && (res->ai_family != AF_INET)))) - { - write(server->child_write, "2", 1); - freeaddrinfo (res); - return 0; + memset (&hints, 0, sizeof(hints)); + hints.ai_family = (server->ipv6) ? AF_INET6 : AF_INET; + hints.ai_socktype = SOCK_STREAM; + rc = getaddrinfo (server->hostname, NULL, &hints, &res_local); + if ((rc != 0) || !res_local + || (server->ipv6 && (res_local->ai_family != AF_INET6)) + || ((!server->ipv6 && (res_local->ai_family != AF_INET)))) + { + write (server->child_write, "5", 1); + if (res_local) + freeaddrinfo (res_local); + return 0; + } + if (bind (server->sock, res_local->ai_addr, res_local->ai_addrlen) < 0) + { + write (server->child_write, "5", 1); + if (res_local) + freeaddrinfo (res_local); + return 0; + } } - if (server->ipv6) - ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (server->port); - else - ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (server->port); - - if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) + /* get info about server */ + memset (&hints, 0, sizeof(hints)); + hints.ai_family = (server->ipv6) ? AF_INET6 : AF_INET; + hints.ai_socktype = SOCK_STREAM; + rc = getaddrinfo (server->address, NULL, &hints, &res); + if ((rc != 0) || !res) { - write(server->child_write, "3", 1); - freeaddrinfo (res); - return 0; + write (server->child_write, "1", 1); + if (res) + freeaddrinfo (res); + return 0; + } + if ((server->ipv6 && (res->ai_family != AF_INET6)) + || ((!server->ipv6 && (res->ai_family != AF_INET)))) + { + write (server->child_write, "2", 1); + if (res) + freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); + return 0; + } + + /* connect to server */ + if (server->ipv6) + ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (server->port); + else + ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (server->port); + + if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) + { + write (server->child_write, "3", 1); + if (res) + freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); + return 0; } } write (server->child_write, "0", 1); - freeaddrinfo (res); + if (res) + freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); return 0; } @@ -1506,14 +1553,14 @@ server_connect (t_irc_server *server) irc_display_prefix (server, server->buffer, PREFIX_INFO); if (cfg_proxy_use) { - gui_printf (server->buffer, - _("%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), - PACKAGE_NAME, server->address, server->port, - (server->ipv6) ? " (IPv6)" : "", - (server->ssl) ? " (SSL)" : "", - cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port, - (cfg_proxy_ipv6) ? " (IPv6)" : ""); - weechat_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), + gui_printf (server->buffer, + _("%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), + PACKAGE_NAME, server->address, server->port, + (server->ipv6) ? " (IPv6)" : "", + (server->ssl) ? " (SSL)" : "", + cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port, + (cfg_proxy_ipv6) ? " (IPv6)" : ""); + weechat_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), server->address, server->port, (server->ipv6) ? " (IPv6)" : "", (server->ssl) ? " (SSL)" : "", @@ -1522,12 +1569,12 @@ server_connect (t_irc_server *server) } else { - gui_printf (server->buffer, - _("%s: connecting to server %s:%d%s%s...\n"), - PACKAGE_NAME, server->address, server->port, - (server->ipv6) ? " (IPv6)" : "", - (server->ssl) ? " (SSL)" : ""); - weechat_log_printf (_("Connecting to server %s:%d%s%s...\n"), + gui_printf (server->buffer, + _("%s: connecting to server %s:%d%s%s...\n"), + PACKAGE_NAME, server->address, server->port, + (server->ipv6) ? " (IPv6)" : "", + (server->ssl) ? " (SSL)" : ""); + weechat_log_printf (_("Connecting to server %s:%d%s%s...\n"), server->address, server->port, (server->ipv6) ? " (IPv6)" : "", (server->ssl) ? " (SSL)" : ""); diff --git a/weechat/po/cs.po b/weechat/po/cs.po index aac150874..814cfc0ba 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:12+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:22+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -103,7 +103,12 @@ msgstr "" "%s selhalo zjednání spojení s proxy serverem (zkontrolujte uživatelské jméno " "a heslo pokud jsou vyžadovány)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -111,57 +116,57 @@ msgstr "" "%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou " "GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: připojuji se k serveru %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Připojuji se k serveru %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s chyba inicializace gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s nemohu vytvořit rouru\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s nemohu vytvořit soket\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s nemohu nastavit nastavení sketu \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s nemohu nastavit nastavení soketu \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Připojuji se znovu k serveru...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Odpojen od serveru!\n" @@ -1392,63 +1397,59 @@ msgstr "sekund" msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "neznámý" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: používám jméno hosta \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nemohu najít přezdívku pro poslání zprávy\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s špatné parametry pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" není validní regulární výraz (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nedostatek paměti pro regulární výraz\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu nebo soukromého " "rozhovoru\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1456,12 +1457,12 @@ msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompilováno na %s %s\n" @@ -2000,6 +2001,10 @@ msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" "%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "neznámý" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Čekám" diff --git a/weechat/po/de.po b/weechat/po/de.po index 078095720..528d719cc 100644 --- a/weechat/po/de.po +++ b/weechat/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:09+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:22+0200\n" "Last-Translator: Thomas Schütz \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -104,7 +104,12 @@ msgstr "" "%s Der Proxy konnte die Verbindung zum Server nicht aufbauen (bitte " "Benutzername/Passwort überprüfen)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -112,57 +117,57 @@ msgstr "" "%s SSL-Verbindung nicht möglich, da WeeChat nicht mit GNUtls-Support " "kompiliert wurde\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: verbinden zu Server %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "verbinden zu Server %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s gnutls Initialisierungsfehler\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s Pipe konnte nicht angelegt werden\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s Socket konnte nicht angelegt werden\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s Fehler beim Setzen der Socketoption \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s Fehler beim Setzen der Socketoption \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Neuverbinden zum Server...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Vom Server getrennt!\n" @@ -1389,64 +1394,60 @@ msgstr "Sekunden" msgid "(hidden)" msgstr "(versteckt)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "unbekannt" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: benutze lokalen Hostnamen \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" "%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s der \"%s\"-Befehl kann nur in Channelfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s der \"%s\"-Befehl kann nicht in Serverfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" ist kein korrekter regulärer Ausdruck (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nicht genügend Speicher für regulären Ausdruck vorhanden\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern " "ausgeführt werden\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1454,12 +1455,12 @@ msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompiliert auf %s %s\n" @@ -1999,6 +2000,10 @@ msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" "%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "unbekannt" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "warten" diff --git a/weechat/po/es.po b/weechat/po/es.po index bf23d14b1..949b213bb 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:17+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -104,7 +104,12 @@ msgstr "" "%s el proxy ha fallado al establecer la conexin al servidor (comprueba el " "nombre de usuario o la contrasea si es necesario)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -112,57 +117,57 @@ msgstr "" "%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado " "con soporte GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: conectando al servidor %s:%d%s%s va %s proxy %s: %d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Conectando al servidor %s:%d%s%s va %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: conectando al servidor %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Conectando al servidor %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s error de inicializacin de gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s no ha sido posible crear la interconexin\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s no ha sido posible crear el socket\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s no ha sido posible configurar la opcin socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s no ha sido posible configurar la opcin socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconectando al servidor...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Desconectado del servidor!\n" @@ -1407,63 +1412,59 @@ msgstr "segundos" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "desconocido" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, fuzzy, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilizacin del nombre de mquina local \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrectos para el comando \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, fuzzy, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s no hay suficiente memoria para atar la clave\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1471,12 +1472,12 @@ msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" @@ -2038,6 +2039,10 @@ msgstr "" "%s: el nombre de usuario \"%s\" ya est en uso, probando con el 1 nombre de " "usuario \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "desconocido" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Esperando" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index dbc8b1dae..e5a63f82e 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:12+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -104,7 +104,12 @@ msgstr "" "%s le proxy n'a pas pu se connecter au serveur (vrifiez l'utilisateur/mot " "de passe si utiliss)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "%s impossible de paramtrer le nom/IP local\n" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -112,57 +117,57 @@ msgstr "" "%s impossible de se connecter en SSL car WeeChat n'a pas t construit avec " "le support GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: connexion au serveur %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Connexion au serveur %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s erreur d'initialisation gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de crer le pipe\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s impossible de crer la socket\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s impossible de paramtrer l'option socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s impossible de paramtrer l'option socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconnexion au serveur...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Dconnect du serveur !\n" @@ -1398,65 +1403,61 @@ msgstr "secondes" msgid "(hidden)" msgstr "(cach)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "inconnu" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" "%s la commande \"%s\" ne peut pas tre excute dans un tampon serveur\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramtres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" n'est pas une expression rgulire valide (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s pas assez de mmoire pour l'expression rgulire\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal ou " "priv\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s pseudo \"%s\" non trouv pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1464,12 +1465,12 @@ msgstr "%s pseudo \"%s\" non trouv msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s impossible de crer le tampon priv \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compil le %s %s\n" @@ -2012,6 +2013,10 @@ msgstr "" "%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 1er " "nom d'utilisateur \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "inconnu" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Attente" diff --git a/weechat/po/hu.po b/weechat/po/hu.po index 1eda3b5d5..de6df5915 100644 --- a/weechat/po/hu.po +++ b/weechat/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-07 13:14+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -108,7 +108,12 @@ msgstr "" "%s a proxy kiszolgálónak nem sikerült a szerverhez csatlakoznia (ellenőrizze " "a felhasználónevet/jelszót ha be van állítva)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -116,61 +121,61 @@ msgstr "" "%s nem sikerült SSL használattal kapcsolódni, mert a WeeChat GNUtls " "támogatás nélkül lett fordítva\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" "%s: csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:" "%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" "Csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:%d%" "s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Csatlakozás a(z) %s:%d%s%s szerverhez...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s gnutls inicializációs hiba\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s nem sikerült a csövet(pipe) létrehozni\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s nem sikerült a csatornát létrehozni\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s nem sikerült a \"SO_REUSEADDR\" csatornaopciót beállítani\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s nem sikerült a \"SO_KEEPALIVE\" csatornaopciót beállítani\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Újracsatlakozás a szerverhez...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Lekapcsolódott a szerverről!\n" @@ -1408,61 +1413,57 @@ msgstr "másodperc" msgid "(hidden)" msgstr "(rejtett)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "ismeretlen" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, fuzzy, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: helyi hosztnév \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nem található név az üzenet küldéséhez\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s rossz argumentum a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, fuzzy, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nincs elég memória a HOME könyvtárhoz\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1470,12 +1471,12 @@ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, lefordítva: %s %s\n" @@ -2020,6 +2021,10 @@ msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n" msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "ismeretlen" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Várakozás" diff --git a/weechat/po/ru.po b/weechat/po/ru.po index 32c6aa43f..cf8553f90 100644 --- a/weechat/po/ru.po +++ b/weechat/po/ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.9-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" -"PO-Revision-Date: 2006-05-10 16:17+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" +"PO-Revision-Date: 2006-05-12 16:21+0200\n" "Last-Translator: Stalwart \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -106,7 +106,12 @@ msgstr "" "%s proxy-сервер не смог установить соединение с сервером (проверьте имя " "пользователя и пароль если они используются)\n" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" @@ -114,57 +119,57 @@ msgstr "" "%s невозможно соединиться с использованием SSL, так как WeeChat собран без " "поддержки GNUtls\n" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "%s: подключение к серверу %s:%d%s%s через %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "Подключаюсь к серверу %s:%d%s%s через %s proxy %s:%d%s...\n" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "Подключаюсь к серверу %s:%d%s%s...\n" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "%s ошибка инициализации gnutls\n" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "%s не могу создать pipe\n" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "%s невозможно создать сокет\n" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Повторное соединение...\n" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "Отключен от сервера!\n" @@ -1392,62 +1397,58 @@ msgstr "секунды" msgid "(hidden)" msgstr "(скрытый)" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "неизвестный" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: используется хост \"%s\"\n" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s не могу найти адресата сообщения\n" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s некорректные аргументы команды \"%s\"\n" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" не является регулярным выражением (%s)\n" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s недостаточно памяти для регулярного выражения\n" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" команда может быть выполнена только в буфере канала или привата\n" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1455,12 +1456,12 @@ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s некорректное количество аргументов команды \"%s\"\n" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, собран %s %s\n" @@ -1994,6 +1995,10 @@ msgstr "%s: все предложеные ники заняты, отключа msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "неизвестный" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "Ожидание" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index be1b8b69f..63c4b8fff 100644 --- a/weechat/po/weechat.pot +++ b/weechat/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-05-10 15:27+0200\n" +"POT-Creation-Date: 2006-05-12 15:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,63 +102,68 @@ msgid "" "used)\n" msgstr "" -#: src/irc/irc-server.c:1501 +#: src/irc/irc-server.c:1033 +#, c-format +msgid "%s unable to set local hostname/IP\n" +msgstr "" + +#: src/irc/irc-server.c:1548 #, c-format msgid "" "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n" msgstr "" -#: src/irc/irc-server.c:1510 +#: src/irc/irc-server.c:1557 #, c-format msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:1516 +#: src/irc/irc-server.c:1563 #, c-format msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n" msgstr "" -#: src/irc/irc-server.c:1526 +#: src/irc/irc-server.c:1573 #, c-format msgid "%s: connecting to server %s:%d%s%s...\n" msgstr "" -#: src/irc/irc-server.c:1530 +#: src/irc/irc-server.c:1577 #, c-format msgid "Connecting to server %s:%d%s%s...\n" msgstr "" -#: src/irc/irc-server.c:1548 +#: src/irc/irc-server.c:1595 #, c-format msgid "%s gnutls init error\n" msgstr "" -#: src/irc/irc-server.c:1563 +#: src/irc/irc-server.c:1610 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:1578 +#: src/irc/irc-server.c:1625 #, c-format msgid "%s cannot create socket\n" msgstr "" -#: src/irc/irc-server.c:1589 +#: src/irc/irc-server.c:1636 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:1600 +#: src/irc/irc-server.c:1647 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:1631 +#: src/irc/irc-server.c:1678 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "" -#: src/irc/irc-server.c:1682 src/irc/irc-server.c:1691 +#: src/irc/irc-server.c:1729 src/irc/irc-server.c:1738 msgid "Disconnected from server!\n" msgstr "" @@ -1288,61 +1293,57 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:64 src/irc/irc-recv.c:5231 -msgid "unknown" -msgstr "" - -#: src/irc/irc-send.c:69 +#: src/irc/irc-send.c:65 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:222 src/common/command.c:993 +#: src/irc/irc-send.c:218 src/common/command.c:993 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/irc/irc-send.c:395 src/irc/irc-send.c:423 src/irc/irc-send.c:645 -#: src/irc/irc-send.c:682 src/irc/irc-send.c:719 src/irc/irc-send.c:773 -#: src/irc/irc-send.c:818 src/irc/irc-send.c:897 src/irc/irc-send.c:958 -#: src/irc/irc-send.c:1344 src/irc/irc-send.c:1486 src/irc/irc-send.c:2012 -#: src/irc/irc-send.c:2142 +#: src/irc/irc-send.c:391 src/irc/irc-send.c:419 src/irc/irc-send.c:641 +#: src/irc/irc-send.c:678 src/irc/irc-send.c:715 src/irc/irc-send.c:769 +#: src/irc/irc-send.c:814 src/irc/irc-send.c:893 src/irc/irc-send.c:954 +#: src/irc/irc-send.c:1340 src/irc/irc-send.c:1482 src/irc/irc-send.c:2008 +#: src/irc/irc-send.c:2138 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" -#: src/irc/irc-send.c:562 src/irc/irc-send.c:582 src/irc/irc-send.c:1112 -#: src/irc/irc-send.c:1548 src/irc/irc-send.c:1930 +#: src/irc/irc-send.c:558 src/irc/irc-send.c:578 src/irc/irc-send.c:1108 +#: src/irc/irc-send.c:1544 src/irc/irc-send.c:1926 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" -#: src/irc/irc-send.c:882 src/irc/irc-send.c:943 src/common/command.c:2024 +#: src/irc/irc-send.c:878 src/irc/irc-send.c:939 src/common/command.c:2024 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1059 +#: src/irc/irc-send.c:1055 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1068 +#: src/irc/irc-send.c:1064 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "" -#: src/irc/irc-send.c:1194 +#: src/irc/irc-send.c:1190 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" -#: src/irc/irc-send.c:1236 src/irc/irc-recv.c:518 +#: src/irc/irc-send.c:1232 src/irc/irc-recv.c:518 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1317 src/irc/irc-send.c:1455 src/irc/irc-send.c:2038 +#: src/irc/irc-send.c:1313 src/irc/irc-send.c:1451 src/irc/irc-send.c:2034 #: src/common/command.c:1969 src/common/command.c:1981 #: src/common/command.c:2000 src/common/command.c:2087 #: src/common/command.c:2600 src/common/command.c:2779 @@ -1350,12 +1351,12 @@ msgstr "" msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1649 +#: src/irc/irc-send.c:1645 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:2099 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1888,6 +1889,10 @@ msgstr "" msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" +#: src/irc/irc-recv.c:5231 +msgid "unknown" +msgstr "" + #: src/irc/irc-dcc.c:49 msgid "Waiting" msgstr "" diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c index 9d09b9d58..b54346eb6 100644 --- a/weechat/src/irc/irc-send.c +++ b/weechat/src/irc/irc-send.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -49,31 +50,26 @@ void irc_login (t_irc_server *server) { - char hostname[128], *ptr_hostname; - + char hostname[NI_MAXHOST]; + if ((server->password) && (server->password[0])) server_sendf (server, "PASS %s\r\n", server->password); - if (server->hostname && server->hostname[0]) - ptr_hostname = server->hostname; - else - { - gethostname (hostname, sizeof (hostname) - 1); - hostname[sizeof (hostname) - 1] = '\0'; - if (!hostname[0]) - strcpy (hostname, _("unknown")); - ptr_hostname = hostname; - } + gethostname (hostname, sizeof (hostname) - 1); + hostname[sizeof (hostname) - 1] = '\0'; + if (!hostname[0]) + snprintf (hostname, NI_MAXHOST, "unknown"); + irc_display_prefix (server, server->buffer, PREFIX_INFO); gui_printf (server->buffer, _("%s: using hostname \"%s\"\n"), - PACKAGE_NAME, ptr_hostname); + PACKAGE_NAME, hostname); if (!server->nick) server->nick = strdup (server->nick1); server_sendf (server, "NICK %s\r\n" "USER %s %s %s :%s\r\n", - server->nick, server->username, ptr_hostname, "servername", + server->nick, server->username, hostname, "servername", server->realname); gui_input_draw (gui_current_window->buffer, 1); } diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index 09b97100a..685979c2d 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -981,51 +981,60 @@ server_child_read (t_irc_server *server) /* adress not found */ case '1': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - if (cfg_proxy_use) - gui_printf (server->buffer, - _("%s proxy address \"%s\" not found\n"), - WEECHAT_ERROR, server->address); - else - gui_printf (server->buffer, - _("%s address \"%s\" not found\n"), - WEECHAT_ERROR, server->address); + if (cfg_proxy_use) + gui_printf (server->buffer, + _("%s proxy address \"%s\" not found\n"), + WEECHAT_ERROR, server->address); + else + gui_printf (server->buffer, + _("%s address \"%s\" not found\n"), + WEECHAT_ERROR, server->address); server_close_connection (server); server_reconnect_schedule (server); break; /* IP address not found */ case '2': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - if (cfg_proxy_use) - gui_printf (server->buffer, - _("%s proxy IP address not found\n"), WEECHAT_ERROR); - else - gui_printf (server->buffer, - _("%s IP address not found\n"), WEECHAT_ERROR); + if (cfg_proxy_use) + gui_printf (server->buffer, + _("%s proxy IP address not found\n"), WEECHAT_ERROR); + else + gui_printf (server->buffer, + _("%s IP address not found\n"), WEECHAT_ERROR); server_close_connection (server); server_reconnect_schedule (server); break; - /* connection refused */ + /* connection refused */ case '3': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - if (cfg_proxy_use) - gui_printf (server->buffer, - _("%s proxy connection refused\n"), WEECHAT_ERROR); - else - gui_printf (server->buffer, - _("%s connection refused\n"), WEECHAT_ERROR); + if (cfg_proxy_use) + gui_printf (server->buffer, + _("%s proxy connection refused\n"), WEECHAT_ERROR); + else + gui_printf (server->buffer, + _("%s connection refused\n"), WEECHAT_ERROR); server_close_connection (server); server_reconnect_schedule (server); break; - /* proxy fails to connect to server */ + /* proxy fails to connect to server */ case '4': irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s proxy fails to establish connection to " + gui_printf (server->buffer, + _("%s proxy fails to establish connection to " "server (check username/password if used)\n"), WEECHAT_ERROR); server_close_connection (server); server_reconnect_schedule (server); break; + /* fails to set local hostname/IP */ + case '5': + irc_display_prefix (server, server->buffer, PREFIX_ERROR); + gui_printf (server->buffer, + _("%s unable to set local hostname/IP\n"), + WEECHAT_ERROR); + server_close_connection (server); + server_reconnect_schedule (server); + break; } } } @@ -1393,90 +1402,128 @@ pass_proxy (int sock, char *address, int port, char *username) int server_child (t_irc_server *server) { - struct addrinfo hints, *res; + struct addrinfo hints, *res, *res_local; + int rc; res = NULL; + res_local = NULL; if (cfg_proxy_use) { - memset (&hints, 0, sizeof (hints)); - hints.ai_family = (cfg_proxy_ipv6) ? AF_INET6 : AF_INET; - hints.ai_socktype = SOCK_STREAM; - if (getaddrinfo (cfg_proxy_address, NULL, &hints, &res) !=0) + /* get info about server */ + memset (&hints, 0, sizeof (hints)); + hints.ai_family = (cfg_proxy_ipv6) ? AF_INET6 : AF_INET; + hints.ai_socktype = SOCK_STREAM; + if (getaddrinfo (cfg_proxy_address, NULL, &hints, &res) !=0) { - write(server->child_write, "1", 1); - return 0; + write(server->child_write, "1", 1); + return 0; } if (!res) { write(server->child_write, "1", 1); - return 0; + return 0; } - if ((cfg_proxy_ipv6 && (res->ai_family != AF_INET6)) - || ((!cfg_proxy_ipv6 && (res->ai_family != AF_INET)))) + if ((cfg_proxy_ipv6 && (res->ai_family != AF_INET6)) + || ((!cfg_proxy_ipv6 && (res->ai_family != AF_INET)))) { - write (server->child_write, "2", 1); + write (server->child_write, "2", 1); freeaddrinfo (res); - return 0; + return 0; } - if (cfg_proxy_ipv6) + if (cfg_proxy_ipv6) ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (cfg_proxy_port); - else + else ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (cfg_proxy_port); - - if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) + + /* connect to server */ + if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) { - write(server->child_write, "3", 1); + write(server->child_write, "3", 1); freeaddrinfo (res); - return 0; + return 0; } - - if (pass_proxy(server->sock, server->address, server->port, server->username)) + + if (pass_proxy(server->sock, server->address, server->port, server->username)) { - write(server->child_write, "4", 1); + write(server->child_write, "4", 1); freeaddrinfo (res); - return 0; + return 0; } } else { - memset (&hints, 0, sizeof(hints)); - hints.ai_family = (server->ipv6) ? AF_INET6 : AF_INET; - hints.ai_socktype = SOCK_STREAM; - if (getaddrinfo (server->address, NULL, &hints, &res) !=0) + /* set local hostname/IP if asked by user */ + if (server->hostname && server->hostname[0]) { - write(server->child_write, "1", 1); - return 0; - } - if (!res) - { - write(server->child_write, "1", 1); - return 0; - } - if ((server->ipv6 && (res->ai_family != AF_INET6)) - || ((!server->ipv6 && (res->ai_family != AF_INET)))) - { - write(server->child_write, "2", 1); - freeaddrinfo (res); - return 0; + memset (&hints, 0, sizeof(hints)); + hints.ai_family = (server->ipv6) ? AF_INET6 : AF_INET; + hints.ai_socktype = SOCK_STREAM; + rc = getaddrinfo (server->hostname, NULL, &hints, &res_local); + if ((rc != 0) || !res_local + || (server->ipv6 && (res_local->ai_family != AF_INET6)) + || ((!server->ipv6 && (res_local->ai_family != AF_INET)))) + { + write (server->child_write, "5", 1); + if (res_local) + freeaddrinfo (res_local); + return 0; + } + if (bind (server->sock, res_local->ai_addr, res_local->ai_addrlen) < 0) + { + write (server->child_write, "5", 1); + if (res_local) + freeaddrinfo (res_local); + return 0; + } } - if (server->ipv6) - ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (server->port); - else - ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (server->port); - - if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) + /* get info about server */ + memset (&hints, 0, sizeof(hints)); + hints.ai_family = (server->ipv6) ? AF_INET6 : AF_INET; + hints.ai_socktype = SOCK_STREAM; + rc = getaddrinfo (server->address, NULL, &hints, &res); + if ((rc != 0) || !res) { - write(server->child_write, "3", 1); - freeaddrinfo (res); - return 0; + write (server->child_write, "1", 1); + if (res) + freeaddrinfo (res); + return 0; + } + if ((server->ipv6 && (res->ai_family != AF_INET6)) + || ((!server->ipv6 && (res->ai_family != AF_INET)))) + { + write (server->child_write, "2", 1); + if (res) + freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); + return 0; + } + + /* connect to server */ + if (server->ipv6) + ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (server->port); + else + ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (server->port); + + if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) + { + write (server->child_write, "3", 1); + if (res) + freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); + return 0; } } write (server->child_write, "0", 1); - freeaddrinfo (res); + if (res) + freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); return 0; } @@ -1506,14 +1553,14 @@ server_connect (t_irc_server *server) irc_display_prefix (server, server->buffer, PREFIX_INFO); if (cfg_proxy_use) { - gui_printf (server->buffer, - _("%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), - PACKAGE_NAME, server->address, server->port, - (server->ipv6) ? " (IPv6)" : "", - (server->ssl) ? " (SSL)" : "", - cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port, - (cfg_proxy_ipv6) ? " (IPv6)" : ""); - weechat_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), + gui_printf (server->buffer, + _("%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), + PACKAGE_NAME, server->address, server->port, + (server->ipv6) ? " (IPv6)" : "", + (server->ssl) ? " (SSL)" : "", + cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port, + (cfg_proxy_ipv6) ? " (IPv6)" : ""); + weechat_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"), server->address, server->port, (server->ipv6) ? " (IPv6)" : "", (server->ssl) ? " (SSL)" : "", @@ -1522,12 +1569,12 @@ server_connect (t_irc_server *server) } else { - gui_printf (server->buffer, - _("%s: connecting to server %s:%d%s%s...\n"), - PACKAGE_NAME, server->address, server->port, - (server->ipv6) ? " (IPv6)" : "", - (server->ssl) ? " (SSL)" : ""); - weechat_log_printf (_("Connecting to server %s:%d%s%s...\n"), + gui_printf (server->buffer, + _("%s: connecting to server %s:%d%s%s...\n"), + PACKAGE_NAME, server->address, server->port, + (server->ipv6) ? " (IPv6)" : "", + (server->ssl) ? " (SSL)" : ""); + weechat_log_printf (_("Connecting to server %s:%d%s%s...\n"), server->address, server->port, (server->ipv6) ? " (IPv6)" : "", (server->ssl) ? " (SSL)" : "");