summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2007-05-09 11:00:11 +0000
committerSebastien Helleu <flashcode@flashtux.org>2007-05-09 11:00:11 +0000
commit054abdff85366cb7e19d3196e60df69daf942dcf (patch)
tree2eb9f4d39ad75eb764e351843d5ee30adf2828c9
parent860e9a08f358da3b2fad49f34335201e0467ff53 (diff)
downloadweechat-054abdff85366cb7e19d3196e60df69daf942dcf.zip
Fixed bug with erroneous nickname when connecting to server (bug #19812), fixed display bugs in IRC error messages
-rw-r--r--ChangeLog4
-rw-r--r--po/cs.po252
-rw-r--r--po/de.po252
-rw-r--r--po/es.po255
-rw-r--r--po/fr.po393
-rw-r--r--po/hu.po247
-rw-r--r--po/ru.po247
-rw-r--r--po/weechat.pot244
-rw-r--r--src/irc/irc-commands.c2
-rw-r--r--src/irc/irc-recv.c163
-rw-r--r--src/irc/irc-server.c2
-rw-r--r--src/irc/irc.h1
-rw-r--r--src/plugins/charset/weechat-charset.c6
-rw-r--r--weechat/ChangeLog4
-rw-r--r--weechat/po/cs.po252
-rw-r--r--weechat/po/de.po252
-rw-r--r--weechat/po/es.po255
-rw-r--r--weechat/po/fr.po393
-rw-r--r--weechat/po/hu.po247
-rw-r--r--weechat/po/ru.po247
-rw-r--r--weechat/po/weechat.pot244
-rw-r--r--weechat/src/irc/irc-commands.c2
-rw-r--r--weechat/src/irc/irc-recv.c163
-rw-r--r--weechat/src/irc/irc-server.c2
-rw-r--r--weechat/src/irc/irc.h1
-rw-r--r--weechat/src/plugins/charset/weechat-charset.c6
26 files changed, 2290 insertions, 1846 deletions
diff --git a/ChangeLog b/ChangeLog
index f94093911..279f6b992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2007-05-04
+ChangeLog - 2007-05-09
Version 0.2.5 (under dev!):
+ * fixed bug with erroneous nickname when connecting to server (bug #19812)
+ * fixed display bugs in IRC error messages
* added protocol priority for gnutls (patch #5915)
* added channel admin mode '!' for some IRC servers
* fixed bug with iso2022jp locale (bug #18719)
diff --git a/po/cs.po b/po/cs.po
index 5fe9e0a31..0ed7e7100 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14,91 +14,91 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Nemůžu získat jméno uživatele"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s nemůžu přidělit nový server\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s chyba při zasílání dat na IRC server\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(zpráva zahozena)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s nedostatek paměti pro získání IRC zprávy\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Příkaz \"%s\" selhal\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Žádný příkaz pro provedení!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Neznámý příkaz: příkaz=\"%s\", host=\"%s\", parametry=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s nemůžu přečíst data ze soketu, odpojuji se od serveru...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s handshake s gnutls selhal\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresa proxy \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresa \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP adresa proxy nenalezena\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP adresa nenalezena\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s proxy odmítla spojení\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s spojení odmítnuto\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -107,12 +107,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:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s nemohu nastavit lokální hostname/IP\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -120,57 +120,57 @@ msgstr ""
"%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou "
"GNUtls\n"
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s chyba inicializace gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s nemohu vytvořit rouru\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nemohu vytvořit soket\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Připojuji se znovu k serveru...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Odpojen od serveru!\n"
@@ -1366,7 +1366,7 @@ msgstr "off"
msgid " (temporary server, will not be saved)"
msgstr " (dočasný server, nebude uložen)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "sekund"
@@ -1421,7 +1421,7 @@ 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:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, 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"
@@ -1444,60 +1444,60 @@ msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, kompilováno na %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Byl jsi pozván na %s%s%s od %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s nemohu vytvořit nový kanál \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s se připojil %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s byl vykopnut %s%s%s z %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s byl zabit %s%s%s ze serveru"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s host \"%s\" nenalezen pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" příkaz obdržen bez hosta\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" příkaz obdržen bez kanálu nebo přezdívky\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Mód %s%s %s[%s%s%s]%s od %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Uživatelský mód %s[%s%s%s]%s od %s%s\n"
@@ -1581,11 +1581,11 @@ msgstr "Kanál %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
@@ -1595,225 +1595,252 @@ msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s neznámý DCC CHAT typ obdržen od "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s skončil"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" příkaz obdržen bez kanálu\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s změnil téma pro %s%s%s na:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s zrušil téma pro %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPS od %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Uživatelský mód pro %s%s%s je %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s je pryč: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Uživatelů online: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s mód nápovědy (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s byl %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s nečinný: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "dní"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "den"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, přihlášen v: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "hodin"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "hodina"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "minut"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "minuta"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "sekunda"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Kanál vytvořen v %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s nemohu identofikovat datum/čas pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s nemohu identifikovat kanál pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Není nastaveno téma pro %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Téma pro %s%s%s je: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Téma nastevil %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s nemohu identifikovat přezdívku pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s pozval %s%s%s na %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Reop kanálu %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " od %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " od %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Přezdívkz %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s nemohu vztvořit přezdívku \"%s\" pro kanál \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Kanál %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "přezdívky"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "přezdívka"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "částeční-ops"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "částečný-op"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normální"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s zakázal "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s takázaný\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
+"serverem!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: 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:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1822,16 +1849,12 @@ msgstr ""
"%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
"serverem!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
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:4851
-msgid "unknown"
-msgstr "neznámý"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Čekám"
@@ -3895,32 +3918,32 @@ msgstr "chyba při čtení typu"
msgid "wrong type (expected: %d, read: %d)"
msgstr "špatný typ (očekáván: %d, přečten: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "jméno serveru nenalezeno"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "sezeni: načítám server \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "server nalezen, aktualizuji hodnoty\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "server nenalezen, vytvářím nový\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "nemohu vytvořit nový server"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "neočekávaný konec souboru (čtu server)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "chyba při inicializaci gnutls"
@@ -5609,3 +5632,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Ukládám konfiguraci na disk\n"
+
+#~ msgid "unknown"
+#~ msgstr "neznámý"
diff --git a/po/de.po b/po/de.po
index cb46d7349..3ceb277e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: <de@li.org>\n"
@@ -18,91 +18,91 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Username konnte nicht ermittelt werden"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s Neuer Server konnte nicht alloziert werden\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s Fehler beim Senden von Daten an den IRC-Server\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(Nachricht verworfen)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s nicht genügend Speicher zum Empfangen der IRC-Nachricht vorhanden\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s der Befehl \"%s\" schlug fehl!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Kein Befehl zum Ausführen!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Unbekannter Befehl: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s Socket-Lesefehler, die Serververbindung wird getrennt...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Neuverbinden in %d Sekunden\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls-Handshake schlug fehl\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s Proxyadresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s Adresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s Proxy-IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s Proxyverbindung verweigert\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s Verbindungsaufbau verweigert\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -111,12 +111,12 @@ msgstr ""
"%s Der Proxy konnte die Verbindung zum Server nicht aufbauen (bitte "
"Benutzername/Passwort überprüfen)\n"
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -124,57 +124,57 @@ msgstr ""
"%s SSL-Verbindung nicht möglich, da WeeChat nicht mit GNUtls-Support "
"kompiliert wurde\n"
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls Initialisierungsfehler\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s Pipe konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s Socket konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Neuverbinden zum Server...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Vom Server getrennt!\n"
@@ -1366,7 +1366,7 @@ msgstr "aus"
msgid " (temporary server, will not be saved)"
msgstr " (temporärer Server, wird nicht gespeichert)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "Sekunden"
@@ -1422,7 +1422,7 @@ msgstr ""
"%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern "
"ausgeführt werden\n"
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
@@ -1445,60 +1445,60 @@ msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, kompiliert auf %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Sie wurden in den Channel %s%s%s von %s%s eingeladen\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s Channel \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s konnte den neuen Channel \"%s\" nicht erzeugen\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s ist in den Channel %s%s gekommen\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s hat %s%s%s aus %s%s gekickt"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s hat %s%s%s vom Server getrennt"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s Host \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Host\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Channel- oder Nickname\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Modus %s%s %s[%s%s%s]%s durch %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Usermodus %s[%s%s%s]%s by %s%s\n"
@@ -1582,11 +1582,11 @@ msgstr "Channel %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
@@ -1596,226 +1596,253 @@ msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s unbekannter DCC CHAT-Typ emfpangen von "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s hat das IRC verlassen"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Channel\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s setzt das Topic für %s%s%s auf:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s hat das Topic von %s%s entfernt\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPS von %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Usermodus für %s%s%s ist %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s ist abwesend: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "User online: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s Hilfemodus (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s war %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s idlet: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "Tage"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "Tag"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, hat sich um %s%s angemeldet"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "Stunden"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "Stunde"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "Minuten"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "Minute"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "Sekunde"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Channel erstellt am %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
"%s kann für den \"%s\"-Befehl kein Datum/keine Uhrzeit identifizieren\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s kann für den \"%s\"-Befehl keinen Channel identifizieren\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Kein Topic gesetzt für %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Das Topic von %s%s%s lautet: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Topic gesetzt von %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s kann für den \"%s\"-Befehl keinen Nickname identifizieren\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s hat %s%s%s in den Channel %s%s eingeladen\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Channel-Reop %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " durch %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " durch %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Nicks %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s Nick \"%s\" für Channel \"%s\" konnte nicht angelegt werden\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "Nicks"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "Nick"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "Operatoren"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "Operator"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "Halb-Operatoren"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "Halb-Operator"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "Gevoicete"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "Gevoiceter"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s wurde gebannt von "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s gebannt\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
+"getrennt!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1824,16 +1851,12 @@ msgstr ""
"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
"getrennt!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
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:4851
-msgid "unknown"
-msgstr "unbekannt"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "warten"
@@ -3928,32 +3951,32 @@ msgstr "Typ-Lesefehler"
msgid "wrong type (expected: %d, read: %d)"
msgstr "Falscher Typ (erwartet: %d, gefunden: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "Servernamen nicht gefunden"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "Sitzung: Lade Server \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "Server gefunden, Werte werden aktualisiert\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "Server nicht gefunden, erstelle einen neuen Server\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "neuer Server konnte nicht alloziert werden"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "unerwartetes Dateiende beim Lesen des Servers"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "gnutls Initialisierungsfehle"
@@ -5664,3 +5687,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Konfiguration wird gespeichert\n"
+
+#~ msgid "unknown"
+#~ msgstr "unbekannt"
diff --git a/po/es.po b/po/es.po
index aca30291e..af16d8bc9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14,93 +14,93 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s no ha sido posible crear un nuevo servidor\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s error enviando datos al servidor IRC\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
#, fuzzy
msgid "(message dropped)"
msgstr "mensaje recibido"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s El comando \"%s\" ha fallado!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Ningn comando para ejecutar!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Comando desconocido: cmd=\"%s\", host=\"%s\", params=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconexin al servidor en %d segundos\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s el handshake gnutls ha fallado\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s direccin proxy \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s direccin \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s direccin proxy IP no encontrada\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s Direccin IP no encontrada\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s conexin proxy rechazada\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s conexin rechazada\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -109,12 +109,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:1227
+#: src/irc/irc-server.c:1236
#, fuzzy, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s no es posible crear el servidor\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -122,57 +122,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:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s error de inicializacin de gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexin\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Desconectado del servidor!\n"
@@ -1384,7 +1384,7 @@ msgstr "inactivo"
msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no ser guardado)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "segundos"
@@ -1439,7 +1439,7 @@ 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:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1462,60 +1462,60 @@ msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilado en %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Usted ha sido invitado a %s%s%s por %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s no es posible crear un nuevo canal \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s se ha unido %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s ha pateado a %s%s%s de %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s ha expulsado a %s%s%s del servidor"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s anfitrin \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s comando \"%s\" recibido sin canal o usuario\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, fuzzy, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, fuzzy, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
@@ -1599,11 +1599,11 @@ msgstr "reop canal %s%s%s: %s%s\n"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
@@ -1613,228 +1613,258 @@ msgstr "%s no es posible analizar el comando \"%s\"\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s ha salido"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s ha cambiado el tema para %s%s%s a:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s ha quitado el tema para %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, fuzzy, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, fuzzy, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est ausente: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, fuzzy, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s inactividad: "
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactividad: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "das"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "da"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, firm en: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, fuzzy, c-format
msgid "Channel created on %s"
msgstr "lista de excepcin de canal"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s no es posible identificar el canal para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Sin tema establecido para %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "El tema para %s%s%s es: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Tema establecido por %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
"%s no es posible determinar el nombre de usuario para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s ha invitado a %s%s%s en %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "reop canal %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, fuzzy, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr "%s%s %s(%s%s%s)%s ha salido"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr ""
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Usuarios %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s baneado por "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s baneado\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 2 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 3 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: todos los nombres de usuario declarados ya estn en uso, cerrando la "
+"conexin con el servidor!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+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:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 2 nombre de "
"usuario \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 3 nombre de "
"usuario \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1843,17 +1873,13 @@ msgstr ""
"%s: todos los nombres de usuario declarados ya estn en uso, cerrando la "
"conexin con el servidor!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
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:4851
-msgid "unknown"
-msgstr "desconocido"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Esperando"
@@ -3948,32 +3974,32 @@ msgstr "error de lectura de tipo"
msgid "wrong type (expected: %d, read: %d)"
msgstr "tipo errneo (esperado: %d, ledo: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "nombre de servidor no encontrado"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "sesin: cargando servidor \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "servidor encontrado, actualizando valores\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "servidor no encontrado, creando uno nuevo\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "no se puede crear un nuevo servidor"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "fin de fichero inesperado (leyendo servidor)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "error de inicio de gnutls"
@@ -5698,3 +5724,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Guardar configuracin a disco\n"
+
+#~ msgid "unknown"
+#~ msgstr "desconocido"
diff --git a/po/fr.po b/po/fr.po
index 392371852..a364dab6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,100 +6,100 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
-"PO-Revision-Date: 2007-04-30 12:59+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
+"PO-Revision-Date: 2007-05-09 12:53+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s impossible d'allouer un nouveau serveur\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s erreur d'envoi de données au serveur IRC\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(message supprimé)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s mémoire insuffisante pour un message IRC reçu\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s La commande \"%s\" a échoué !\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Pas de commande à exécuter !\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Commande inconnue: cmd=\"%s\", hote=\"%s\", params=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s impossible de lire des données sur la socket, déconnexion du serveur...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconnexion au serveur dans %d secondes\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s le handshake gnutls a échoué\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresse du proxy \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresse \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s adresse IP du proxy introuvable\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s adresse IP introuvable\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s connexion au proxy refusée\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s connexion refusée\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -108,12 +108,12 @@ msgstr ""
"%s le proxy n'a pas pu se connecter au serveur (vérifiez l'utilisateur/mot "
"de passe si utilisés)\n"
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s impossible de paramétrer le nom/IP local\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -121,57 +121,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:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de créer le pipe\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de créer la socket\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Déconnecté du serveur !\n"
@@ -267,7 +267,7 @@ msgid ""
" type: CTCP type (examples: \"version\", \"ping\", ..)\n"
"arguments: arguments for CTCP"
msgstr ""
-" cible: utilisateur à qui envoyer le CTCP\n"
+" cible: pseudo à qui envoyer le CTCP\n"
" type: type de CTCP (exemples: \"version\", \"ping\", etc...)\n"
"arguments: arguments pour le CTCP"
@@ -289,7 +289,7 @@ msgstr ""
#: src/irc/irc-commands.c:67
msgid "removes half channel operator status from nickname(s)"
-msgstr "retire le statut de demi-opérateur du canal à/aux nick(s)"
+msgstr "retire le statut de demi-opérateur du canal à/aux pseudo(s)"
#: src/irc/irc-commands.c:68 src/irc/irc-commands.c:71
#: src/irc/irc-commands.c:74 src/irc/irc-commands.c:81
@@ -299,7 +299,7 @@ msgstr "[pseudo [pseudo]]"
#: src/irc/irc-commands.c:70
msgid "removes channel operator status from nickname(s)"
-msgstr "retire le statut d'opérateur du canal à/aux nick(s)"
+msgstr "retire le statut d'opérateur du canal à/aux pseudo(s)"
#: src/irc/irc-commands.c:73
msgid "removes voice from nickname(s)"
@@ -315,7 +315,7 @@ msgstr "erreur reçue du serveur IRC"
#: src/irc/irc-commands.c:80
msgid "gives half channel operator status to nickname(s)"
-msgstr "donner le statut de demi-opérateur à un/des utilisateur(s)"
+msgstr "donner le statut de demi-opérateur à un/des pseudo(s)"
#: src/irc/irc-commands.c:83
msgid "get information describing the server"
@@ -327,7 +327,7 @@ msgstr "cible: nom du serveur"
#: src/irc/irc-commands.c:87
msgid "invite a nick on a channel"
-msgstr "inviter un utilisateur sur un canal"
+msgstr "inviter un pseudo sur un canal"
#: src/irc/irc-commands.c:88
msgid "nickname channel"
@@ -338,12 +338,12 @@ msgid ""
"nickname: nick to invite\n"
" channel: channel to invite"
msgstr ""
-" pseudo: utilisateur à inviter\n"
+" pseudo: pseudo à inviter\n"
"channel: canal pour l'invitation"
#: src/irc/irc-commands.c:92
msgid "check if a nickname is currently on IRC"
-msgstr "vérifier si un utilisateur est actuellement sur IRC"
+msgstr "vérifier si un pseudo est actuellement sur IRC"
#: src/irc/irc-commands.c:93 src/irc/irc-commands.c:272
msgid "nickname [nickname ...]"
@@ -384,12 +384,12 @@ msgid ""
" comment: comment for kick"
msgstr ""
" canal: canal où l'utilisateur se trouve\n"
-" pseudo: utilisateur à éliminer\n"
+" pseudo: pseudo à éliminer\n"
"commentaire: commentaire pour l'élimination"
#: src/irc/irc-commands.c:107
msgid "kicks and bans a nick from a channel"
-msgstr "retirer par la force un utilisateur d'un canal et le bannir"
+msgstr "retirer par la force un pseudo d'un canal et le bannir"
#: src/irc/irc-commands.c:109
msgid ""
@@ -398,7 +398,7 @@ msgid ""
" comment: comment for kick"
msgstr ""
" canal: canal où l'utilisateur se trouve\n"
-" pseudo: utilisateur à éliminer et bannir\n"
+" pseudo: pseudo à éliminer et bannir\n"
"commentaire: commentaire pour l'élimination"
#: src/irc/irc-commands.c:113
@@ -414,7 +414,7 @@ msgid ""
"nickname: nickname\n"
" comment: comment for kill"
msgstr ""
-" pseudo: utilisateur\n"
+" pseudo: pseudo\n"
"commentaire: commentaire pour la mort"
#: src/irc/irc-commands.c:118
@@ -480,7 +480,7 @@ msgid ""
"{[+|-]|i|w|s|o} }"
msgstr ""
"{ canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de "
-"banissement] } | { nick {[+|-]|i|w|s|o} }"
+"banissement] } | { pseudo {[+|-]|i|w|s|o} }"
#: src/irc/irc-commands.c:139
msgid ""
@@ -521,7 +521,7 @@ msgstr ""
" v: donner/reprendre la possibilité de parler sur un canal modéré\n"
" k: définir une clé (mot de passe) pour accéder au canal\n"
"modes utilisateur :\n"
-" pseudo: utilisateur à modifier\n"
+" pseudo: pseudo à modifier\n"
" i: marquer un utilisateur comme invisible\n"
" s: marquer un utilisateur pour recevoir les notices du serveur\n"
" w: l'utilisateur reçoit les wallops\n"
@@ -533,7 +533,7 @@ msgstr "obtenir le message du jour"
#: src/irc/irc-commands.c:164
msgid "send message to a nick or channel"
-msgstr "envoyer un message à un utilisateur ou canal"
+msgstr "envoyer un message à un pseudo ou canal"
#: src/irc/irc-commands.c:165
msgid "receiver[,receiver] text"
@@ -544,12 +544,12 @@ msgid ""
"receiver: nick or channel (may be mask, '*' = current channel)\n"
"text: text to send"
msgstr ""
-"cible: utilisateur ou canal (peut-être un masque, '*' = canal courant)\n"
+"cible: pseudo ou canal (peut-être un masque, '*' = canal courant)\n"
"texte: texte à envoyer"
#: src/irc/irc-commands.c:169
msgid "list nicknames on channels"
-msgstr "lister les utilisateurs sur des canaux"
+msgstr "lister les pseudos sur des canaux"
#: src/irc/irc-commands.c:170
msgid "[channel[,channel]]"
@@ -588,12 +588,12 @@ msgid ""
"nickname: user to send notice to\n"
" text: text to send"
msgstr ""
-"pseudo: utilisateur cible pour la notice\n"
+"pseudo: pseudo cible pour la notice\n"
" texte: texte à envoyer"
#: src/irc/irc-commands.c:183
msgid "gives channel operator status to nickname(s)"
-msgstr "donner le statut opérateur à un/des utilisateur(s)"
+msgstr "donner le statut opérateur à un/des pseudo(s)"
#: src/irc/irc-commands.c:184
msgid "nickname [nickname]"
@@ -663,7 +663,7 @@ msgstr "message reçu"
#: src/irc/irc-commands.c:206
msgid "send a private message to a nick"
-msgstr "envoyer un message privé à un utilisateur"
+msgstr "envoyer un message privé à un pseudo"
#: src/irc/irc-commands.c:207
msgid "nickname [text]"
@@ -674,7 +674,7 @@ msgid ""
"nickname: nickname for private conversation\n"
" text: text to send"
msgstr ""
-"pseudo: utilisateur pour la conversation privée\n"
+"pseudo: pseudo pour la conversation privée\n"
" texte: texte à envoyer"
#: src/irc/irc-commands.c:211
@@ -858,7 +858,7 @@ msgstr ""
#: src/irc/irc-commands.c:271
msgid "return a list of information about nicknames"
-msgstr "retourne une liste d'informations sur des utilisateurs"
+msgstr "retourne une liste d'informations sur des pseudos"
#: src/irc/irc-commands.c:275
msgid "list of users logged into the server"
@@ -866,8 +866,7 @@ msgstr "liste des utilisateurs connectés au serveur"
#: src/irc/irc-commands.c:279
msgid "gives the version info of nick or server (current or specified)"
-msgstr ""
-"retourne la version de l'utilisateur ou du serveur (courant ou spécifié)"
+msgstr "retourne la version du pseudo ou du serveur (courant ou spécifié)"
#: src/irc/irc-commands.c:280
msgid "[server | nickname]"
@@ -879,11 +878,11 @@ msgid ""
"nickname: nickname"
msgstr ""
"serveur: nom du serveur\n"
-" pseudo: utilisateur"
+" pseudo: pseudo"
#: src/irc/irc-commands.c:284
msgid "gives voice to nickname(s)"
-msgstr "donne la voix à/aux utilisateur(s)"
+msgstr "donne la voix à/aux pseudo(s)"
#: src/irc/irc-commands.c:287
msgid ""
@@ -927,11 +926,11 @@ msgid ""
"nickname: nickname (may be a mask)"
msgstr ""
"serveur: nom du serveur\n"
-" pseudo: utilisateur (peut être un masque)"
+" pseudo: pseudo (peut être un masque)"
#: src/irc/irc-commands.c:302
msgid "ask for information about a nickname which no longer exists"
-msgstr "demander de l'information sur un nick qui n'existe plus"
+msgstr "demander de l'information sur un pseudo qui n'existe plus"
#: src/irc/irc-commands.c:303
msgid "nickname [,nickname [,nickname ...]] [count [target]]"
@@ -1066,7 +1065,7 @@ msgstr ""
#: src/irc/irc-commands.c:363
msgid "infos about topic (nick and date changed)"
-msgstr "informations sur le titre (utilisateur et date de changement)"
+msgstr "informations sur le titre (pseudo et date de changement)"
#: src/irc/irc-commands.c:365
msgid "whois (host)"
@@ -1102,7 +1101,7 @@ msgstr "qui"
#: src/irc/irc-commands.c:381
msgid "list of nicks on channel"
-msgstr "liste des utilisateurs sur un canal"
+msgstr "liste des pseudos sur un canal"
#: src/irc/irc-commands.c:382
msgid "channel :[[@|+]nick ...]"
@@ -1114,7 +1113,7 @@ msgid ""
" nick: nick on the channel"
msgstr ""
" canal: nom du canal\n"
-"pseudo: utilisateur sur le canal"
+"pseudo: pseudo sur le canal"
#: src/irc/irc-commands.c:386
msgid "end of /names list"
@@ -1134,7 +1133,7 @@ msgstr "connexion depuis"
#: src/irc/irc-commands.c:394
msgid "no such nick/channel"
-msgstr "pas de tel utilisateur/canal"
+msgstr "pas de tel pseudo/canal"
#: src/irc/irc-commands.c:396
msgid "no such server"
@@ -1154,7 +1153,7 @@ msgstr "trop de canaux"
#: src/irc/irc-commands.c:404 src/irc/irc-commands.c:406
msgid "was no such nick"
-msgstr "n'y avait pas de tel utilisateur"
+msgstr "n'y avait pas de tel pseudo"
#: src/irc/irc-commands.c:408
msgid "no origin"
@@ -1198,19 +1197,19 @@ msgstr "erreur de fichier"
#: src/irc/irc-commands.c:428
msgid "no nickname given"
-msgstr "pas d'utilisateur donné"
+msgstr "pas de pseudo donné"
#: src/irc/irc-commands.c:430
msgid "erroneous nickname"
-msgstr "nom d'utilisateur erroné"
+msgstr "pseudo erroné"
#: src/irc/irc-commands.c:432
msgid "nickname already in use"
-msgstr "nom d'utilisateur déjà en cours d'utilisation"
+msgstr "pseudo déjà en cours d'utilisation"
#: src/irc/irc-commands.c:434
msgid "nickname collision"
-msgstr "collision sur le nom d'utilisateur"
+msgstr "collision sur le pseudo"
#: src/irc/irc-commands.c:436
msgid "resource unavailable"
@@ -1372,7 +1371,7 @@ msgstr "désactivé"
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "secondes"
@@ -1429,7 +1428,7 @@ msgstr ""
"%s la commande \"%s\" peut seulement être exécutée dans un tampon canal ou "
"privé\n"
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n"
@@ -1452,60 +1451,60 @@ msgstr "%s impossible de créer le tampon privé \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilé le %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Vous avez été invité sur %s%s%s par %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s impossible de créer le nouveau canal \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s a rejoint %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s a poussé dehors %s%s%s de %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s a tué %s%s%s du serveur"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s la machine \"%s\" n'existe pas pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
-msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n"
+msgstr "%s commande \"%s\" reçue sans canal ou pseudo\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Mode %s%s %s[%s%s%s]%s par %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Mode utilisateur %s[%s%s%s]%s par %s%s\n"
@@ -1523,7 +1522,7 @@ msgstr "%s%s%s est maintenant connu sous le nom %s%s\n"
#: src/irc/irc-recv.c:904
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
-msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
+msgstr "%s pseudo non trouvé pour la commande \"%s\"\n"
#: src/irc/irc-recv.c:918
#, c-format
@@ -1589,11 +1588,11 @@ msgstr "Canal %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
@@ -1603,246 +1602,265 @@ msgstr "%s impossible d'analyser la commande \"%s\"\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s type de DCC CHAT inconnu reçu de "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s a quitté"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s a changé le titre pour %s%s%s en:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s a retiré le titre pour %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPS de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Mode utilisateur pour %s%s%s est %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est absent: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s mode aide (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s était %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactivité: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signé le: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Canal créé le %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Pas de titre défini pour %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Le titre pour %s%s%s est: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Titre défini par %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
-msgstr ""
-"%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
+msgstr "%s impossible de déterminer le pseudo pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s a invité %s%s%s sur %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Reop canal %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " par %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " par %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
-msgstr "Utilisateurs %s%s%s: %s["
+msgstr "Pseudos %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
-msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
+msgstr "%s impossible de créer le pseudo \"%s\" pour le canal \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
-msgstr "utilisateurs"
+msgstr "pseudos"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
-msgstr "utilisateur"
+msgstr "pseudo"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s banni par "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s banni\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr "%s: essai avec le 2ème pseudo \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr "%s: essai avec le 3ème pseudo \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: tous les pseudos déclarés sont déjà en cours d'utilisation ou invalides, "
+"fermeture de la connexion avec le serveur !\n"
+
+#: src/irc/irc-recv.c:4844
+#, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr "%s: essai avec le 1er pseudo \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
-"nom d'utilisateur \"%s\"\n"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
+"pseudo \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
-"nom d'utilisateur \"%s\"\n"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
+"pseudo \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-"%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, "
-"fermeture de la connexion avec le serveur !\n"
+"%s: tous les pseudos déclarés sont déjà en cours d'utilisation, fermeture de "
+"la connexion avec le serveur !\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
-"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
-"nom d'utilisateur \"%s\"\n"
-
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr "inconnu"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
+"pseudo \"%s\"\n"
#: src/irc/irc-dcc.c:55
msgid "Waiting"
@@ -2541,15 +2559,15 @@ msgstr "bascule de serveur actif sur le tampon des serveurs"
#: src/gui/gui-keyboard.c:133
msgid "scroll to previous highlight in buffer"
-msgstr "scroller jusqu'au highlight précédent du tampon"
+msgstr "faire défiler jusqu'au highlight précédent du tampon"
#: src/gui/gui-keyboard.c:135
msgid "scroll to next highlight in buffer"
-msgstr "scroller jusqu'au highlight suivant du tampon"
+msgstr "faire défiler jusqu'au highlight suivant du tampon"
#: src/gui/gui-keyboard.c:137
msgid "scroll to first unread line in buffer"
-msgstr "scroller jusqu'à la première ligne non lue du tampon"
+msgstr "faire défiler jusqu'à la première ligne non lue du tampon"
#: src/gui/gui-keyboard.c:139
msgid "clear hotlist"
@@ -3949,32 +3967,32 @@ msgstr "erreur de lecture du type"
msgid "wrong type (expected: %d, read: %d)"
msgstr "type erroné (attendu: %d, lu: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "nom de serveur non trouvé"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "session: chargement du serveur \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "serveur trouvé, mise à jour des valeurs\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "serveur non trouvé, création d'un nouveau\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "impossible de créer un nouveau serveur"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "fin de fichier inattendue (en lecture d'un serveur)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "erreur d'initialisation gnutls"
@@ -4441,44 +4459,44 @@ msgstr "afficher les actions avec différentes couleurs"
#: src/common/weeconfig.c:159
msgid "display nicklist window"
-msgstr "afficher la fenêtre des utilisateurs"
+msgstr "afficher la fenêtre des pseudos"
#: src/common/weeconfig.c:160
msgid "display nicklist window (for channel windows)"
-msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
+msgstr "afficher la fenêtre des pseudos (pour les fenêtres de canaux)"
#: src/common/weeconfig.c:163
msgid "nicklist position"
-msgstr "position de la fenêtre d'utilisateurs"
+msgstr "position de la fenêtre des pseudos"
#: src/common/weeconfig.c:164
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
-"position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
+"position de la fenêtre des pseudos (haut (top), gauche (left), droite "
"(right, par défaut), bas (bottom))"
#: src/common/weeconfig.c:167
msgid "min size for nicklist"
-msgstr "taille minimum pour la fenêtre d'utilisateurs"
+msgstr "taille minimum pour la fenêtre des pseudos"
#: src/common/weeconfig.c:168
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
msgstr ""
-"taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
+"taille minimum pour la fenêtre des pseudos (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille minimum))"
#: src/common/weeconfig.c:172
msgid "max size for nicklist"
-msgstr "taille maximum pour la fenêtre d'utilisateurs"
+msgstr "taille maximum pour la fenêtre des pseudos"
#: src/common/weeconfig.c:173
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
msgstr ""
-"taille maximum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
+"taille maximum pour la fenêtre des pseudos (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
"alors la taille est fixe))"
@@ -4489,17 +4507,16 @@ msgstr "séparateur entre la discussion et la liste de pseudos"
#: src/common/weeconfig.c:181 src/common/weeconfig.c:182
msgid "text to display instead of nick when not connected"
msgstr ""
-"texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
-"n'est pas active"
+"texte à afficher en lieu et place du pseudo lorsque la connexion n'est pas "
+"active"
#: src/common/weeconfig.c:185 src/common/weeconfig.c:186
msgid "display nick mode ((half)op/voice) before each nick"
-msgstr ""
-"afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
+msgstr "afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur"
#: src/common/weeconfig.c:189 src/common/weeconfig.c:190
msgid "display space if nick mode is not (half)op/voice"
-msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
+msgstr "afficher un espace si le mode du pseudo n'est pas (half)op/voice"
#: src/common/weeconfig.c:193 src/common/weeconfig.c:194
msgid "text to display before nick in chat window"
@@ -4673,7 +4690,7 @@ msgstr "couleur pour la barre de titre"
#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
msgid "color for '+' when scrolling topic"
-msgstr "couleur pour les '+' lors du scroll sur le titre"
+msgstr "couleur pour les '+' lors du défilement du titre"
#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
msgid "background for title bar"
@@ -4721,12 +4738,11 @@ msgstr "couleur pour la flèche du part/quit (préfixe)"
#: src/common/weeconfig.c:408
msgid "color for nicks in actions"
-msgstr "couleur pour les noms d'utilisateurs dans les actions"
+msgstr "couleur pour les pseudos dans les actions"
#: src/common/weeconfig.c:409
msgid "color for nicks in actions (chat window)"
-msgstr ""
-"couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
+msgstr "couleur pour les pseudos dans les actions (fenêtre de discussion)"
#: src/common/weeconfig.c:412
msgid "color for hostnames"
@@ -4918,7 +4934,7 @@ msgstr "couleur pour le symbole voix"
#: src/common/weeconfig.c:556 src/common/weeconfig.c:557
msgid "color for '+' when scrolling nicks"
-msgstr "couleur pour les '+' lors du scroll sur les pseudos"
+msgstr "couleur pour les '+' lors du défilement des pseudos"
#: src/common/weeconfig.c:560 src/common/weeconfig.c:561
msgid "color for nick separator"
@@ -5697,3 +5713,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+
+#~ msgid "unknown"
+#~ msgstr "inconnu"
diff --git a/po/hu.po b/po/hu.po
index 751251412..d4bfb045a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -16,93 +16,93 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "A felhasználónév meghatározása sikertelen"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s az új szerver lefoglalása sikertelen\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s adatküldési hiba az IRC szerveren\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(üzenet eldobva)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s nincs elegendő memória a fogadott IRC üzenet számára\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Parancs \"%s\" sikertelen!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s A futtatandó parancs nem található!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
"%s Ismeretlen parancs: parancs=\"%s\", hoszt=\"%s\", argumentum=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s nem sikerült adatot olvasni a csatornából, kilépés a szerverről...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Újracsatlakozás a szerverhez %d másodperc múlva\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls kézfogás sikertelen\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s proxy cím \"%s\" nem található\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s cím \"%s\" nem található\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s proxy IP-cím nem található\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-cím nem található\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s a proxy kiszolgálóhoz való csatlakozás elutasítva\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s a csatlakozás elutasítva\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -111,12 +111,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:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s nem sikerült a helyi hosztnevet/IP-t beállítani\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -124,61 +124,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:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls inicializációs hiba\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, 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:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nem sikerült a csatornát létrehozni\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Újracsatlakozás a szerverhez...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Lekapcsolódott a szerverről!\n"
@@ -1378,7 +1378,7 @@ msgstr "ki"
msgid " (temporary server, will not be saved)"
msgstr " (átmeneti szerver, nem lesz mentve)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "másodperc"
@@ -1431,7 +1431,7 @@ msgstr "%s nincs elég memória a reguláris kifejezéshez\n"
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:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n"
@@ -1454,60 +1454,60 @@ msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, lefordítva: %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Meghívást kapott a %s%s%s szobába %s%s felhasználótól\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s nem sikerült új szobát nyitni \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s belépett a(z) %s%s szobába\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s eltávolította %s%s%s-t a szerverről"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s a(z) \"%s\" hoszt nem található a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" parancs érkezett hoszt megadása nélkül\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" parancs érkezett szoba vagy név megadása nélkül\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr ""
@@ -1591,11 +1591,11 @@ msgstr "%s szoba: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
@@ -1605,238 +1605,256 @@ msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s usmeretlen DCC CHAT típus érkezett a következőtől:"
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s kilépett"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" parancs érkezett szoba megadása nélkül\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s törölte a %s%s szoba témáját\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "%s%s%s felhasználói módja: %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s távol: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Online felhasználók: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s segítség mód (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s neve %s volt\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s tétlen: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "nap"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "nap"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, bejelentkezett: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "óra"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "óra"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "perc"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "perc"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "másodperc"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Szoba létrehozva: %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s nem sikerült a dátumot/időt meghatározni a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s nem sikerült azonosítani a szobát a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Nincs téma beállítva a %s%s szobában\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "A %s%s%s szoba témája: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "A témát beállította: %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s nem sikerült a felhasználót meghatározni a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr ""
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr ""
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Felhasználók a %s%s%s szobában: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s nem sikerült a(z) \"%s\" nevet felvenni a \"%s\" szobában\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"%s%s%s szoba: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "név"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "név"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "operátor"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "operátor"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normál"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s-t kitiltotta "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s kitiltva\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: 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:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
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:4851
-msgid "unknown"
-msgstr "ismeretlen"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Várakozás"
@@ -3906,32 +3924,32 @@ msgstr "típus olvasási hiba"
msgid "wrong type (expected: %d, read: %d)"
msgstr "rossz típus (várt: %d, beolvasott: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "a szerver neve nem található"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "folyamat: \"%s\" szerver betöltése\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "megvan a szerver, értékek frissítése\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "a szerver nem található, új szerver készítése\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "nem sikerült új szervert készíteni"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "váratlan fájlvég (szerver olvasása)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "gnutls inicializációs hiba"
@@ -5623,3 +5641,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Beállítások mentése a lemezre\n"
+
+#~ msgid "unknown"
+#~ msgstr "ismeretlen"
diff --git a/po/ru.po b/po/ru.po
index 8a10953bb..326c0a7e7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -15,92 +15,92 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Не могу получить имя пользователя"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s не могу расположить новый сервер\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s ошибка при отправке данных IRC серверу\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(сообщение отброшено)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s недостаточно памяти для полученного сообщения\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Команда \"%s\" не удалась!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Нет команд для запуска!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
"%s Неизвестная команда: команда=\"%s\", хост=\"%s\", аргументы=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s невозможно прочитать данные из сокета, отключаюсь от сервера...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Повторное подключение к серверу через %d секунд\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s инициализация gnutls не удалось\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s proxy \"%s\" не найден\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s адрес \"%s\" не найден\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP адрес proxy-сервера не найден\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP адрес не найден\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s в подключении к proxy-серверу отказано\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s в подключении отказано\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -109,12 +109,12 @@ msgstr ""
"%s proxy-сервер не смог установить соединение с сервером (проверьте имя "
"пользователя и пароль если они используются)\n"
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s не могу установить локальный хост/IP\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -122,57 +122,57 @@ msgstr ""
"%s невозможно соединиться с использованием SSL, так как WeeChat собран без "
"поддержки GNUtls\n"
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1771
+#: src/irc/irc-server.c:1777
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Подключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s ошибка инициализации gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s не могу создать pipe\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s невозможно создать сокет\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Повторное соединение...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Отключен от сервера!\n"
@@ -1365,7 +1365,7 @@ msgstr "выкл."
msgid " (temporary server, will not be saved)"
msgstr " (временный сервер, не будет сохранён)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "секунды"
@@ -1419,7 +1419,7 @@ msgid "%s \"%s\" command can only be executed in a channel or private buffer\n"
msgstr ""
"%s \"%s\" команда может быть выполнена только в буфере канала или привата\n"
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s ник \"%s\" не найден для команды \"%s\"\n"
@@ -1442,60 +1442,60 @@ msgstr "%s невозможно создать новый буфер прива
msgid "%s, compiled on %s %s\n"
msgstr "%s, собран %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Вас пригласил на %s%s%s пользователь %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s канал \"%s\" не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s не могу создать новый канал \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s зашёл на канал %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s убил %s%s%s"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s хост \"%s\" не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" команда получена без хоста\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" команда получена без канала или ника\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Режим %s%s %s[%s%s%s]%s установлен пользователем %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Режим %s[%s%s%s]%s пользователем %s%s\n"
@@ -1579,11 +1579,11 @@ msgstr "Канал %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s не могу проанализировать команду \"%s\"\n"
@@ -1593,238 +1593,256 @@ msgstr "%s не могу проанализировать команду \"%s\"\
msgid "%s unknown DCC CHAT type received from "
msgstr "%s неизвестный режим DCC CHAT получен от "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s вышел"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" команда получена без канала\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s сменил тему %s%s%s на:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s удалил тему канала для %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPы от %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Режим пользователя %s%s%s - %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s отсутствует: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Пользователей в сети:"
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s режим помощи (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s был %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s бездействует: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "дней"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "день"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, вошёл в сеть: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "часов"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "час"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "минут"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "минута"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "секунда"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Канал создан %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s не могу опознать дату/время для команды \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s не могу опознать канал для команды \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Не установлена тема канала для %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Тема канала %s%s%s: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Тема установлена пользователем %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s не могу опознать ник для команды \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Реоп канала %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " пользователем %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " пользователем %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Ники %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s не могу создать ник \"%s\" для канала \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Канал %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "ники"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "ник"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "опы"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "оп"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "полуопы"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "полуоп"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "войсы"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "войс"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "обычные"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s забанен пользователем "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s забанен\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr "неизвестный"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Ожидание"
@@ -3891,32 +3909,32 @@ msgstr "ошибка чтения типа"
msgid "wrong type (expected: %d, read: %d)"
msgstr "некорректный тип (ожидалось: %d, прочитано: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "имя сервера не найдено"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "сессия: загружаю сервер \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "сервер найден, обновляю значения\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "сервер не найден, создаю новый\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "невозможно создать новый сервер"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "неожиданный конец файла (при чтении сервера)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "ошибка инициализации gnutls"
@@ -5613,3 +5631,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Сохраняю конфигурацию\n"
+
+#~ msgid "unknown"
+#~ msgstr "неизвестный"
diff --git a/po/weechat.pot b/po/weechat.pot
index b3b2d7ad5..b1429e809 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: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,159 +15,159 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr ""
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr ""
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr ""
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr ""
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr ""
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr ""
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr ""
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr ""
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
"used)\n"
msgstr ""
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr ""
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1757
+#: src/irc/irc-server.c:1763
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1767
+#: src/irc/irc-server.c:1773
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1771
+#: src/irc/irc-server.c:1777
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr ""
@@ -1262,7 +1262,7 @@ msgstr ""
msgid " (temporary server, will not be saved)"
msgstr ""
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "%s \"%s\" command can only be executed in a channel or private buffer\n"
msgstr ""
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
@@ -1338,60 +1338,60 @@ msgstr ""
msgid "%s, compiled on %s %s\n"
msgstr ""
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr ""
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr ""
@@ -1475,11 +1475,11 @@ msgstr ""
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
@@ -1489,237 +1489,255 @@ msgstr ""
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr ""
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr ""
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr ""
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr ""
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr ""
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr ""
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr ""
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr ""
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr ""
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr ""
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr ""
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr ""
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr ""
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr ""
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4822
+#, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4833
+#, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4844
+#, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr ""
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr ""
@@ -3605,32 +3623,32 @@ msgstr ""
msgid "wrong type (expected: %d, read: %d)"
msgstr ""
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr ""
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr ""
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr ""
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr ""
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr ""
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr ""
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr ""
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 51e9e542a..923019237 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -428,7 +428,7 @@ t_irc_command irc_commands[] =
{ "431", N_("no nickname given"), "", "",
NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "432", N_("erroneous nickname"), "", "",
- NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+ NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_432 },
{ "433", N_("nickname already in use"), "", "",
NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_433 },
{ "436", N_("nickname collision"), "", "",
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 7fba01650..b1d1b9e94 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -326,69 +326,63 @@ irc_recv_command (t_irc_server *server, char *entire_line,
int
irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos2;
+ char *pos;
int first;
t_gui_buffer *ptr_buffer;
t_irc_channel *ptr_channel;
/* make C compiler happy */
- (void) server;
(void) host;
(void) nick;
- if (strncmp (arguments, "Closing Link", 12) == 0)
- {
- server_disconnect (server, 1);
- return 0;
- }
-
- pos = strchr (arguments, ' ');
- if (pos)
- {
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
- }
- else
- pos = arguments;
-
first = 1;
-
ptr_buffer = server->buffer;
- while (pos && pos[0])
+
+ while (arguments && arguments[0])
{
- pos2 = strchr (pos, ' ');
- if ((pos[0] == ':') || (!pos2))
+ while (arguments[0] == ' ')
+ arguments++;
+
+ if (arguments[0] == ':')
{
- if (pos[0] == ':')
- pos++;
+ arguments++;
if (first)
irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
gui_printf (ptr_buffer, "%s%s%s\n",
GUI_COLOR(COLOR_WIN_CHAT),
(first) ? "" : ": ",
- pos);
- pos = NULL;
+ arguments);
+ if (strncmp (arguments, "Closing Link", 12) == 0)
+ server_disconnect (server, 1);
+ arguments = NULL;
}
else
{
- pos2[0] = '\0';
- if (first)
+ pos = strchr (arguments, ' ');
+ if (pos)
+ pos[0] = '\0';
+ if (strcmp (arguments, server->nick) != 0)
{
- ptr_channel = channel_search (server, pos);
- if (ptr_channel)
- ptr_buffer = ptr_channel->buffer;
- irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
+ if (first)
+ {
+ ptr_channel = channel_search (server, arguments);
+ if (ptr_channel)
+ ptr_buffer = ptr_channel->buffer;
+ irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
+ }
+ gui_printf (ptr_buffer, "%s%s%s",
+ GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+ (first) ? "" : " ",
+ arguments);
+ first = 0;
}
- gui_printf (ptr_buffer, "%s%s%s",
- GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
- (first) ? "" : " ",
- pos);
- first = 0;
- pos = pos2 + 1;
+ if (pos)
+ arguments = pos + 1;
+ else
+ arguments = NULL;
}
}
+
return 0;
}
@@ -452,6 +446,9 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
char *pos;
+
+ if (arguments[0] == ':')
+ arguments++;
command_ignored |= ignore_check (host, "join", arguments, server->name);
@@ -795,6 +792,9 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *nick, char *arguments
WEECHAT_ERROR, "nick");
return -1;
}
+
+ if (arguments[0] == ':')
+ arguments++;
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
@@ -2096,6 +2096,9 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *nick, char *arguments
WEECHAT_ERROR, "quit");
return -1;
}
+
+ if (arguments[0] == ':')
+ arguments++;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
@@ -2196,6 +2199,9 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *nick, char *arg
if (!command_ignored)
{
+ while (arguments[0] == ' ')
+ arguments++;
+
/* skip nickname if at beginning of server message */
if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
{
@@ -4786,14 +4792,76 @@ irc_cmd_recv_378 (t_irc_server *server, char *host, char *nick, char *arguments)
}
/*
+ * irc_cmd_recv_432: '432' command received (erroneous nickname)
+ */
+
+int
+irc_cmd_recv_432 (t_irc_server *server, char *host, char *nick, char *arguments)
+{
+ /* Note: this IRC command can not be ignored */
+
+ irc_cmd_recv_error (server, host, nick, arguments);
+
+ if (!server->is_connected)
+ {
+ if (strcmp (server->nick, server->nick1) == 0)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: trying 2nd nickname \"%s\"\n"),
+ PACKAGE_NAME, server->nick2);
+ free (server->nick);
+ server->nick = strdup (server->nick2);
+ }
+ else
+ {
+ if (strcmp (server->nick, server->nick2) == 0)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: trying 3rd nickname \"%s\"\n"),
+ PACKAGE_NAME, server->nick3);
+ free (server->nick);
+ server->nick = strdup (server->nick3);
+ }
+ else
+ {
+ if (strcmp (server->nick, server->nick3) == 0)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: all declared nicknames are already in "
+ "use or invalid, closing connection with "
+ "server!\n"),
+ PACKAGE_NAME);
+ server_disconnect (server, 1);
+ return 0;
+ }
+ else
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: trying 1st nickname \"%s\"\n"),
+ PACKAGE_NAME, server->nick1);
+ free (server->nick);
+ server->nick = strdup (server->nick1);
+ }
+ }
+ }
+ server_sendf (server,
+ "NICK %s",
+ server->nick);
+ }
+ return 0;
+}
+
+/*
* irc_cmd_recv_433: '433' command received (nickname already in use)
*/
int
irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char hostname[128];
-
/* Note: this IRC command can not be ignored */
if (!server->is_connected)
@@ -4803,7 +4871,7 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: nickname \"%s\" is already in use, "
- "trying 2nd nickname \"%s\"\n"),
+ "trying 2nd nickname \"%s\"\n"),
PACKAGE_NAME, server->nick, server->nick2);
free (server->nick);
server->nick = strdup (server->nick2);
@@ -4815,7 +4883,7 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: nickname \"%s\" is already in use, "
- "trying 3rd nickname \"%s\"\n"),
+ "trying 3rd nickname \"%s\"\n"),
PACKAGE_NAME, server->nick, server->nick3);
free (server->nick);
server->nick = strdup (server->nick3);
@@ -4827,7 +4895,7 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: all declared nicknames are already in use, "
- "closing connection with server!\n"),
+ "closing connection with server!\n"),
PACKAGE_NAME);
server_disconnect (server, 1);
return 0;
@@ -4837,18 +4905,13 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: nickname \"%s\" is already in use, "
- "trying 1st nickname \"%s\"\n"),
+ "trying 1st nickname \"%s\"\n"),
PACKAGE_NAME, server->nick, server->nick1);
free (server->nick);
server->nick = strdup (server->nick1);
}
}
}
-
- gethostname (hostname, sizeof (hostname) - 1);
- hostname[sizeof (hostname) - 1] = '\0';
- if (!hostname[0])
- strcpy (hostname, _("unknown"));
server_sendf (server,
"NICK %s",
server->nick);
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index 78175dc81..5a4c25f2e 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -771,8 +771,6 @@ server_parse_message (char *message, char **host, char **command, char **args)
pos2++;
while (pos2[0] == ' ')
pos2++;
- if (pos2[0] == ':')
- pos2++;
*args = strdup (pos2);
}
}
diff --git a/src/irc/irc.h b/src/irc/irc.h
index 8eb26cb4c..0090f5c3f 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -604,6 +604,7 @@ extern int irc_cmd_recv_366 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_367 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_368 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_378 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_432 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_433 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_438 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_671 (t_irc_server *, char *, char *, char *);
diff --git a/src/plugins/charset/weechat-charset.c b/src/plugins/charset/weechat-charset.c
index 0941d6ecd..58443e9f6 100644
--- a/src/plugins/charset/weechat-charset.c
+++ b/src/plugins/charset/weechat-charset.c
@@ -234,11 +234,9 @@ weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
pos2++;
while (pos2[0] == ' ')
pos2++;
- if (pos2[0] == ':')
- *pos_args = pos2 + 1;
- else
+ *pos_args = pos2;
+ if (pos2[0] != ':')
{
- *pos_args = pos2;
if ((pos2[0] == '#') || (pos2[0] == '&')
|| (pos2[0] == '+') || (pos2[0] == '!'))
{
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index f94093911..279f6b992 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2007-05-04
+ChangeLog - 2007-05-09
Version 0.2.5 (under dev!):
+ * fixed bug with erroneous nickname when connecting to server (bug #19812)
+ * fixed display bugs in IRC error messages
* added protocol priority for gnutls (patch #5915)
* added channel admin mode '!' for some IRC servers
* fixed bug with iso2022jp locale (bug #18719)
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index 5fe9e0a31..0ed7e7100 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14,91 +14,91 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Nemůžu získat jméno uživatele"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s nemůžu přidělit nový server\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s chyba při zasílání dat na IRC server\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(zpráva zahozena)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s nedostatek paměti pro získání IRC zprávy\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Příkaz \"%s\" selhal\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Žádný příkaz pro provedení!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Neznámý příkaz: příkaz=\"%s\", host=\"%s\", parametry=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s nemůžu přečíst data ze soketu, odpojuji se od serveru...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s handshake s gnutls selhal\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresa proxy \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresa \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP adresa proxy nenalezena\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP adresa nenalezena\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s proxy odmítla spojení\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s spojení odmítnuto\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -107,12 +107,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:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s nemohu nastavit lokální hostname/IP\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -120,57 +120,57 @@ msgstr ""
"%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou "
"GNUtls\n"
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s chyba inicializace gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s nemohu vytvořit rouru\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nemohu vytvořit soket\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Připojuji se znovu k serveru...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Odpojen od serveru!\n"
@@ -1366,7 +1366,7 @@ msgstr "off"
msgid " (temporary server, will not be saved)"
msgstr " (dočasný server, nebude uložen)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "sekund"
@@ -1421,7 +1421,7 @@ 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:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, 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"
@@ -1444,60 +1444,60 @@ msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, kompilováno na %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Byl jsi pozván na %s%s%s od %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s nemohu vytvořit nový kanál \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s se připojil %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s byl vykopnut %s%s%s z %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s byl zabit %s%s%s ze serveru"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s host \"%s\" nenalezen pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" příkaz obdržen bez hosta\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" příkaz obdržen bez kanálu nebo přezdívky\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Mód %s%s %s[%s%s%s]%s od %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Uživatelský mód %s[%s%s%s]%s od %s%s\n"
@@ -1581,11 +1581,11 @@ msgstr "Kanál %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
@@ -1595,225 +1595,252 @@ msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s neznámý DCC CHAT typ obdržen od "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s skončil"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" příkaz obdržen bez kanálu\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s změnil téma pro %s%s%s na:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s zrušil téma pro %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPS od %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Uživatelský mód pro %s%s%s je %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s je pryč: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Uživatelů online: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s mód nápovědy (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s byl %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s nečinný: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "dní"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "den"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, přihlášen v: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "hodin"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "hodina"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "minut"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "minuta"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "sekunda"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Kanál vytvořen v %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s nemohu identofikovat datum/čas pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s nemohu identifikovat kanál pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Není nastaveno téma pro %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Téma pro %s%s%s je: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Téma nastevil %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s nemohu identifikovat přezdívku pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s pozval %s%s%s na %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Reop kanálu %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " od %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " od %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Přezdívkz %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s nemohu vztvořit přezdívku \"%s\" pro kanál \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Kanál %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "přezdívky"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "přezdívka"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "částeční-ops"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "částečný-op"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normální"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s zakázal "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s takázaný\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
+"serverem!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: 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:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1822,16 +1849,12 @@ msgstr ""
"%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
"serverem!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
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:4851
-msgid "unknown"
-msgstr "neznámý"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Čekám"
@@ -3895,32 +3918,32 @@ msgstr "chyba při čtení typu"
msgid "wrong type (expected: %d, read: %d)"
msgstr "špatný typ (očekáván: %d, přečten: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "jméno serveru nenalezeno"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "sezeni: načítám server \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "server nalezen, aktualizuji hodnoty\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "server nenalezen, vytvářím nový\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "nemohu vytvořit nový server"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "neočekávaný konec souboru (čtu server)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "chyba při inicializaci gnutls"
@@ -5609,3 +5632,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Ukládám konfiguraci na disk\n"
+
+#~ msgid "unknown"
+#~ msgstr "neznámý"
diff --git a/weechat/po/de.po b/weechat/po/de.po
index cb46d7349..3ceb277e4 100644
--- a/weechat/po/de.po
+++ b/weechat/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: <de@li.org>\n"
@@ -18,91 +18,91 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Username konnte nicht ermittelt werden"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s Neuer Server konnte nicht alloziert werden\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s Fehler beim Senden von Daten an den IRC-Server\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(Nachricht verworfen)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s nicht genügend Speicher zum Empfangen der IRC-Nachricht vorhanden\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s der Befehl \"%s\" schlug fehl!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Kein Befehl zum Ausführen!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Unbekannter Befehl: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s Socket-Lesefehler, die Serververbindung wird getrennt...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Neuverbinden in %d Sekunden\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls-Handshake schlug fehl\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s Proxyadresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s Adresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s Proxy-IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s Proxyverbindung verweigert\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s Verbindungsaufbau verweigert\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -111,12 +111,12 @@ msgstr ""
"%s Der Proxy konnte die Verbindung zum Server nicht aufbauen (bitte "
"Benutzername/Passwort überprüfen)\n"
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -124,57 +124,57 @@ msgstr ""
"%s SSL-Verbindung nicht möglich, da WeeChat nicht mit GNUtls-Support "
"kompiliert wurde\n"
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls Initialisierungsfehler\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s Pipe konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s Socket konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Neuverbinden zum Server...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Vom Server getrennt!\n"
@@ -1366,7 +1366,7 @@ msgstr "aus"
msgid " (temporary server, will not be saved)"
msgstr " (temporärer Server, wird nicht gespeichert)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "Sekunden"
@@ -1422,7 +1422,7 @@ msgstr ""
"%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern "
"ausgeführt werden\n"
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
@@ -1445,60 +1445,60 @@ msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, kompiliert auf %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Sie wurden in den Channel %s%s%s von %s%s eingeladen\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s Channel \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s konnte den neuen Channel \"%s\" nicht erzeugen\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s ist in den Channel %s%s gekommen\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s hat %s%s%s aus %s%s gekickt"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s hat %s%s%s vom Server getrennt"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s Host \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Host\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Channel- oder Nickname\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Modus %s%s %s[%s%s%s]%s durch %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Usermodus %s[%s%s%s]%s by %s%s\n"
@@ -1582,11 +1582,11 @@ msgstr "Channel %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
@@ -1596,226 +1596,253 @@ msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s unbekannter DCC CHAT-Typ emfpangen von "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s hat das IRC verlassen"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Channel\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s setzt das Topic für %s%s%s auf:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s hat das Topic von %s%s entfernt\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPS von %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Usermodus für %s%s%s ist %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s ist abwesend: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "User online: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s Hilfemodus (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s war %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s idlet: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "Tage"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "Tag"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, hat sich um %s%s angemeldet"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "Stunden"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "Stunde"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "Minuten"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "Minute"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "Sekunde"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Channel erstellt am %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
"%s kann für den \"%s\"-Befehl kein Datum/keine Uhrzeit identifizieren\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s kann für den \"%s\"-Befehl keinen Channel identifizieren\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Kein Topic gesetzt für %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Das Topic von %s%s%s lautet: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Topic gesetzt von %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s kann für den \"%s\"-Befehl keinen Nickname identifizieren\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s hat %s%s%s in den Channel %s%s eingeladen\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Channel-Reop %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " durch %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " durch %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Nicks %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s Nick \"%s\" für Channel \"%s\" konnte nicht angelegt werden\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "Nicks"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "Nick"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "Operatoren"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "Operator"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "Halb-Operatoren"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "Halb-Operator"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "Gevoicete"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "Gevoiceter"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s wurde gebannt von "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s gebannt\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
+"getrennt!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1824,16 +1851,12 @@ msgstr ""
"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
"getrennt!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
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:4851
-msgid "unknown"
-msgstr "unbekannt"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "warten"
@@ -3928,32 +3951,32 @@ msgstr "Typ-Lesefehler"
msgid "wrong type (expected: %d, read: %d)"
msgstr "Falscher Typ (erwartet: %d, gefunden: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "Servernamen nicht gefunden"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "Sitzung: Lade Server \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "Server gefunden, Werte werden aktualisiert\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "Server nicht gefunden, erstelle einen neuen Server\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "neuer Server konnte nicht alloziert werden"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "unerwartetes Dateiende beim Lesen des Servers"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "gnutls Initialisierungsfehle"
@@ -5664,3 +5687,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Konfiguration wird gespeichert\n"
+
+#~ msgid "unknown"
+#~ msgstr "unbekannt"
diff --git a/weechat/po/es.po b/weechat/po/es.po
index aca30291e..af16d8bc9 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14,93 +14,93 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s no ha sido posible crear un nuevo servidor\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s error enviando datos al servidor IRC\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
#, fuzzy
msgid "(message dropped)"
msgstr "mensaje recibido"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s El comando \"%s\" ha fallado!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Ningn comando para ejecutar!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Comando desconocido: cmd=\"%s\", host=\"%s\", params=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconexin al servidor en %d segundos\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s el handshake gnutls ha fallado\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s direccin proxy \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s direccin \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s direccin proxy IP no encontrada\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s Direccin IP no encontrada\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s conexin proxy rechazada\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s conexin rechazada\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -109,12 +109,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:1227
+#: src/irc/irc-server.c:1236
#, fuzzy, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s no es posible crear el servidor\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -122,57 +122,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:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s error de inicializacin de gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexin\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Desconectado del servidor!\n"
@@ -1384,7 +1384,7 @@ msgstr "inactivo"
msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no ser guardado)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "segundos"
@@ -1439,7 +1439,7 @@ 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:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1462,60 +1462,60 @@ msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilado en %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Usted ha sido invitado a %s%s%s por %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s no es posible crear un nuevo canal \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s se ha unido %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s ha pateado a %s%s%s de %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s ha expulsado a %s%s%s del servidor"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s anfitrin \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s comando \"%s\" recibido sin canal o usuario\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, fuzzy, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, fuzzy, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
@@ -1599,11 +1599,11 @@ msgstr "reop canal %s%s%s: %s%s\n"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
@@ -1613,228 +1613,258 @@ msgstr "%s no es posible analizar el comando \"%s\"\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s ha salido"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s ha cambiado el tema para %s%s%s a:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s ha quitado el tema para %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, fuzzy, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, fuzzy, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est ausente: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, fuzzy, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s inactividad: "
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactividad: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "das"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "da"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, firm en: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, fuzzy, c-format
msgid "Channel created on %s"
msgstr "lista de excepcin de canal"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s no es posible identificar el canal para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Sin tema establecido para %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "El tema para %s%s%s es: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Tema establecido por %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
"%s no es posible determinar el nombre de usuario para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s ha invitado a %s%s%s en %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "reop canal %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, fuzzy, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr "%s%s %s(%s%s%s)%s ha salido"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr ""
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Usuarios %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s baneado por "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s baneado\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 2 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 3 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: todos los nombres de usuario declarados ya estn en uso, cerrando la "
+"conexin con el servidor!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+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:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 2 nombre de "
"usuario \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: el nombre de usuario \"%s\" ya est en uso, probando con el 3 nombre de "
"usuario \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1843,17 +1873,13 @@ msgstr ""
"%s: todos los nombres de usuario declarados ya estn en uso, cerrando la "
"conexin con el servidor!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
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:4851
-msgid "unknown"
-msgstr "desconocido"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Esperando"
@@ -3948,32 +3974,32 @@ msgstr "error de lectura de tipo"
msgid "wrong type (expected: %d, read: %d)"
msgstr "tipo errneo (esperado: %d, ledo: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "nombre de servidor no encontrado"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "sesin: cargando servidor \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "servidor encontrado, actualizando valores\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "servidor no encontrado, creando uno nuevo\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "no se puede crear un nuevo servidor"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "fin de fichero inesperado (leyendo servidor)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "error de inicio de gnutls"
@@ -5698,3 +5724,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Guardar configuracin a disco\n"
+
+#~ msgid "unknown"
+#~ msgstr "desconocido"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 392371852..a364dab6c 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -6,100 +6,100 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
-"PO-Revision-Date: 2007-04-30 12:59+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
+"PO-Revision-Date: 2007-05-09 12:53+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s impossible d'allouer un nouveau serveur\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s erreur d'envoi de données au serveur IRC\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(message supprimé)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s mémoire insuffisante pour un message IRC reçu\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s La commande \"%s\" a échoué !\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Pas de commande à exécuter !\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr "%s Commande inconnue: cmd=\"%s\", hote=\"%s\", params=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s impossible de lire des données sur la socket, déconnexion du serveur...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconnexion au serveur dans %d secondes\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s le handshake gnutls a échoué\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresse du proxy \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresse \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s adresse IP du proxy introuvable\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s adresse IP introuvable\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s connexion au proxy refusée\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s connexion refusée\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -108,12 +108,12 @@ msgstr ""
"%s le proxy n'a pas pu se connecter au serveur (vérifiez l'utilisateur/mot "
"de passe si utilisés)\n"
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s impossible de paramétrer le nom/IP local\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -121,57 +121,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:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de créer le pipe\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de créer la socket\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Déconnecté du serveur !\n"
@@ -267,7 +267,7 @@ msgid ""
" type: CTCP type (examples: \"version\", \"ping\", ..)\n"
"arguments: arguments for CTCP"
msgstr ""
-" cible: utilisateur à qui envoyer le CTCP\n"
+" cible: pseudo à qui envoyer le CTCP\n"
" type: type de CTCP (exemples: \"version\", \"ping\", etc...)\n"
"arguments: arguments pour le CTCP"
@@ -289,7 +289,7 @@ msgstr ""
#: src/irc/irc-commands.c:67
msgid "removes half channel operator status from nickname(s)"
-msgstr "retire le statut de demi-opérateur du canal à/aux nick(s)"
+msgstr "retire le statut de demi-opérateur du canal à/aux pseudo(s)"
#: src/irc/irc-commands.c:68 src/irc/irc-commands.c:71
#: src/irc/irc-commands.c:74 src/irc/irc-commands.c:81
@@ -299,7 +299,7 @@ msgstr "[pseudo [pseudo]]"
#: src/irc/irc-commands.c:70
msgid "removes channel operator status from nickname(s)"
-msgstr "retire le statut d'opérateur du canal à/aux nick(s)"
+msgstr "retire le statut d'opérateur du canal à/aux pseudo(s)"
#: src/irc/irc-commands.c:73
msgid "removes voice from nickname(s)"
@@ -315,7 +315,7 @@ msgstr "erreur reçue du serveur IRC"
#: src/irc/irc-commands.c:80
msgid "gives half channel operator status to nickname(s)"
-msgstr "donner le statut de demi-opérateur à un/des utilisateur(s)"
+msgstr "donner le statut de demi-opérateur à un/des pseudo(s)"
#: src/irc/irc-commands.c:83
msgid "get information describing the server"
@@ -327,7 +327,7 @@ msgstr "cible: nom du serveur"
#: src/irc/irc-commands.c:87
msgid "invite a nick on a channel"
-msgstr "inviter un utilisateur sur un canal"
+msgstr "inviter un pseudo sur un canal"
#: src/irc/irc-commands.c:88
msgid "nickname channel"
@@ -338,12 +338,12 @@ msgid ""
"nickname: nick to invite\n"
" channel: channel to invite"
msgstr ""
-" pseudo: utilisateur à inviter\n"
+" pseudo: pseudo à inviter\n"
"channel: canal pour l'invitation"
#: src/irc/irc-commands.c:92
msgid "check if a nickname is currently on IRC"
-msgstr "vérifier si un utilisateur est actuellement sur IRC"
+msgstr "vérifier si un pseudo est actuellement sur IRC"
#: src/irc/irc-commands.c:93 src/irc/irc-commands.c:272
msgid "nickname [nickname ...]"
@@ -384,12 +384,12 @@ msgid ""
" comment: comment for kick"
msgstr ""
" canal: canal où l'utilisateur se trouve\n"
-" pseudo: utilisateur à éliminer\n"
+" pseudo: pseudo à éliminer\n"
"commentaire: commentaire pour l'élimination"
#: src/irc/irc-commands.c:107
msgid "kicks and bans a nick from a channel"
-msgstr "retirer par la force un utilisateur d'un canal et le bannir"
+msgstr "retirer par la force un pseudo d'un canal et le bannir"
#: src/irc/irc-commands.c:109
msgid ""
@@ -398,7 +398,7 @@ msgid ""
" comment: comment for kick"
msgstr ""
" canal: canal où l'utilisateur se trouve\n"
-" pseudo: utilisateur à éliminer et bannir\n"
+" pseudo: pseudo à éliminer et bannir\n"
"commentaire: commentaire pour l'élimination"
#: src/irc/irc-commands.c:113
@@ -414,7 +414,7 @@ msgid ""
"nickname: nickname\n"
" comment: comment for kill"
msgstr ""
-" pseudo: utilisateur\n"
+" pseudo: pseudo\n"
"commentaire: commentaire pour la mort"
#: src/irc/irc-commands.c:118
@@ -480,7 +480,7 @@ msgid ""
"{[+|-]|i|w|s|o} }"
msgstr ""
"{ canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de "
-"banissement] } | { nick {[+|-]|i|w|s|o} }"
+"banissement] } | { pseudo {[+|-]|i|w|s|o} }"
#: src/irc/irc-commands.c:139
msgid ""
@@ -521,7 +521,7 @@ msgstr ""
" v: donner/reprendre la possibilité de parler sur un canal modéré\n"
" k: définir une clé (mot de passe) pour accéder au canal\n"
"modes utilisateur :\n"
-" pseudo: utilisateur à modifier\n"
+" pseudo: pseudo à modifier\n"
" i: marquer un utilisateur comme invisible\n"
" s: marquer un utilisateur pour recevoir les notices du serveur\n"
" w: l'utilisateur reçoit les wallops\n"
@@ -533,7 +533,7 @@ msgstr "obtenir le message du jour"
#: src/irc/irc-commands.c:164
msgid "send message to a nick or channel"
-msgstr "envoyer un message à un utilisateur ou canal"
+msgstr "envoyer un message à un pseudo ou canal"
#: src/irc/irc-commands.c:165
msgid "receiver[,receiver] text"
@@ -544,12 +544,12 @@ msgid ""
"receiver: nick or channel (may be mask, '*' = current channel)\n"
"text: text to send"
msgstr ""
-"cible: utilisateur ou canal (peut-être un masque, '*' = canal courant)\n"
+"cible: pseudo ou canal (peut-être un masque, '*' = canal courant)\n"
"texte: texte à envoyer"
#: src/irc/irc-commands.c:169
msgid "list nicknames on channels"
-msgstr "lister les utilisateurs sur des canaux"
+msgstr "lister les pseudos sur des canaux"
#: src/irc/irc-commands.c:170
msgid "[channel[,channel]]"
@@ -588,12 +588,12 @@ msgid ""
"nickname: user to send notice to\n"
" text: text to send"
msgstr ""
-"pseudo: utilisateur cible pour la notice\n"
+"pseudo: pseudo cible pour la notice\n"
" texte: texte à envoyer"
#: src/irc/irc-commands.c:183
msgid "gives channel operator status to nickname(s)"
-msgstr "donner le statut opérateur à un/des utilisateur(s)"
+msgstr "donner le statut opérateur à un/des pseudo(s)"
#: src/irc/irc-commands.c:184
msgid "nickname [nickname]"
@@ -663,7 +663,7 @@ msgstr "message reçu"
#: src/irc/irc-commands.c:206
msgid "send a private message to a nick"
-msgstr "envoyer un message privé à un utilisateur"
+msgstr "envoyer un message privé à un pseudo"
#: src/irc/irc-commands.c:207
msgid "nickname [text]"
@@ -674,7 +674,7 @@ msgid ""
"nickname: nickname for private conversation\n"
" text: text to send"
msgstr ""
-"pseudo: utilisateur pour la conversation privée\n"
+"pseudo: pseudo pour la conversation privée\n"
" texte: texte à envoyer"
#: src/irc/irc-commands.c:211
@@ -858,7 +858,7 @@ msgstr ""
#: src/irc/irc-commands.c:271
msgid "return a list of information about nicknames"
-msgstr "retourne une liste d'informations sur des utilisateurs"
+msgstr "retourne une liste d'informations sur des pseudos"
#: src/irc/irc-commands.c:275
msgid "list of users logged into the server"
@@ -866,8 +866,7 @@ msgstr "liste des utilisateurs connectés au serveur"
#: src/irc/irc-commands.c:279
msgid "gives the version info of nick or server (current or specified)"
-msgstr ""
-"retourne la version de l'utilisateur ou du serveur (courant ou spécifié)"
+msgstr "retourne la version du pseudo ou du serveur (courant ou spécifié)"
#: src/irc/irc-commands.c:280
msgid "[server | nickname]"
@@ -879,11 +878,11 @@ msgid ""
"nickname: nickname"
msgstr ""
"serveur: nom du serveur\n"
-" pseudo: utilisateur"
+" pseudo: pseudo"
#: src/irc/irc-commands.c:284
msgid "gives voice to nickname(s)"
-msgstr "donne la voix à/aux utilisateur(s)"
+msgstr "donne la voix à/aux pseudo(s)"
#: src/irc/irc-commands.c:287
msgid ""
@@ -927,11 +926,11 @@ msgid ""
"nickname: nickname (may be a mask)"
msgstr ""
"serveur: nom du serveur\n"
-" pseudo: utilisateur (peut être un masque)"
+" pseudo: pseudo (peut être un masque)"
#: src/irc/irc-commands.c:302
msgid "ask for information about a nickname which no longer exists"
-msgstr "demander de l'information sur un nick qui n'existe plus"
+msgstr "demander de l'information sur un pseudo qui n'existe plus"
#: src/irc/irc-commands.c:303
msgid "nickname [,nickname [,nickname ...]] [count [target]]"
@@ -1066,7 +1065,7 @@ msgstr ""
#: src/irc/irc-commands.c:363
msgid "infos about topic (nick and date changed)"
-msgstr "informations sur le titre (utilisateur et date de changement)"
+msgstr "informations sur le titre (pseudo et date de changement)"
#: src/irc/irc-commands.c:365
msgid "whois (host)"
@@ -1102,7 +1101,7 @@ msgstr "qui"
#: src/irc/irc-commands.c:381
msgid "list of nicks on channel"
-msgstr "liste des utilisateurs sur un canal"
+msgstr "liste des pseudos sur un canal"
#: src/irc/irc-commands.c:382
msgid "channel :[[@|+]nick ...]"
@@ -1114,7 +1113,7 @@ msgid ""
" nick: nick on the channel"
msgstr ""
" canal: nom du canal\n"
-"pseudo: utilisateur sur le canal"
+"pseudo: pseudo sur le canal"
#: src/irc/irc-commands.c:386
msgid "end of /names list"
@@ -1134,7 +1133,7 @@ msgstr "connexion depuis"
#: src/irc/irc-commands.c:394
msgid "no such nick/channel"
-msgstr "pas de tel utilisateur/canal"
+msgstr "pas de tel pseudo/canal"
#: src/irc/irc-commands.c:396
msgid "no such server"
@@ -1154,7 +1153,7 @@ msgstr "trop de canaux"
#: src/irc/irc-commands.c:404 src/irc/irc-commands.c:406
msgid "was no such nick"
-msgstr "n'y avait pas de tel utilisateur"
+msgstr "n'y avait pas de tel pseudo"
#: src/irc/irc-commands.c:408
msgid "no origin"
@@ -1198,19 +1197,19 @@ msgstr "erreur de fichier"
#: src/irc/irc-commands.c:428
msgid "no nickname given"
-msgstr "pas d'utilisateur donné"
+msgstr "pas de pseudo donné"
#: src/irc/irc-commands.c:430
msgid "erroneous nickname"
-msgstr "nom d'utilisateur erroné"
+msgstr "pseudo erroné"
#: src/irc/irc-commands.c:432
msgid "nickname already in use"
-msgstr "nom d'utilisateur déjà en cours d'utilisation"
+msgstr "pseudo déjà en cours d'utilisation"
#: src/irc/irc-commands.c:434
msgid "nickname collision"
-msgstr "collision sur le nom d'utilisateur"
+msgstr "collision sur le pseudo"
#: src/irc/irc-commands.c:436
msgid "resource unavailable"
@@ -1372,7 +1371,7 @@ msgstr "désactivé"
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "secondes"
@@ -1429,7 +1428,7 @@ msgstr ""
"%s la commande \"%s\" peut seulement être exécutée dans un tampon canal ou "
"privé\n"
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n"
@@ -1452,60 +1451,60 @@ msgstr "%s impossible de créer le tampon privé \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilé le %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Vous avez été invité sur %s%s%s par %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s impossible de créer le nouveau canal \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s a rejoint %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s a poussé dehors %s%s%s de %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s a tué %s%s%s du serveur"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s la machine \"%s\" n'existe pas pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
-msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n"
+msgstr "%s commande \"%s\" reçue sans canal ou pseudo\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Mode %s%s %s[%s%s%s]%s par %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Mode utilisateur %s[%s%s%s]%s par %s%s\n"
@@ -1523,7 +1522,7 @@ msgstr "%s%s%s est maintenant connu sous le nom %s%s\n"
#: src/irc/irc-recv.c:904
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
-msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
+msgstr "%s pseudo non trouvé pour la commande \"%s\"\n"
#: src/irc/irc-recv.c:918
#, c-format
@@ -1589,11 +1588,11 @@ msgstr "Canal %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
@@ -1603,246 +1602,265 @@ msgstr "%s impossible d'analyser la commande \"%s\"\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s type de DCC CHAT inconnu reçu de "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s a quitté"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s a changé le titre pour %s%s%s en:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s a retiré le titre pour %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPS de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Mode utilisateur pour %s%s%s est %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est absent: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s mode aide (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s était %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactivité: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signé le: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Canal créé le %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Pas de titre défini pour %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Le titre pour %s%s%s est: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Titre défini par %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
-msgstr ""
-"%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
+msgstr "%s impossible de déterminer le pseudo pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s a invité %s%s%s sur %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Reop canal %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " par %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " par %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
-msgstr "Utilisateurs %s%s%s: %s["
+msgstr "Pseudos %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
-msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
+msgstr "%s impossible de créer le pseudo \"%s\" pour le canal \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
-msgstr "utilisateurs"
+msgstr "pseudos"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
-msgstr "utilisateur"
+msgstr "pseudo"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s banni par "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s banni\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr "%s: essai avec le 2ème pseudo \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr "%s: essai avec le 3ème pseudo \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: tous les pseudos déclarés sont déjà en cours d'utilisation ou invalides, "
+"fermeture de la connexion avec le serveur !\n"
+
+#: src/irc/irc-recv.c:4844
+#, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr "%s: essai avec le 1er pseudo \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
-"nom d'utilisateur \"%s\"\n"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
+"pseudo \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
-"nom d'utilisateur \"%s\"\n"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
+"pseudo \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-"%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, "
-"fermeture de la connexion avec le serveur !\n"
+"%s: tous les pseudos déclarés sont déjà en cours d'utilisation, fermeture de "
+"la connexion avec le serveur !\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
-"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
-"nom d'utilisateur \"%s\"\n"
-
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr "inconnu"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
+"pseudo \"%s\"\n"
#: src/irc/irc-dcc.c:55
msgid "Waiting"
@@ -2541,15 +2559,15 @@ msgstr "bascule de serveur actif sur le tampon des serveurs"
#: src/gui/gui-keyboard.c:133
msgid "scroll to previous highlight in buffer"
-msgstr "scroller jusqu'au highlight précédent du tampon"
+msgstr "faire défiler jusqu'au highlight précédent du tampon"
#: src/gui/gui-keyboard.c:135
msgid "scroll to next highlight in buffer"
-msgstr "scroller jusqu'au highlight suivant du tampon"
+msgstr "faire défiler jusqu'au highlight suivant du tampon"
#: src/gui/gui-keyboard.c:137
msgid "scroll to first unread line in buffer"
-msgstr "scroller jusqu'à la première ligne non lue du tampon"
+msgstr "faire défiler jusqu'à la première ligne non lue du tampon"
#: src/gui/gui-keyboard.c:139
msgid "clear hotlist"
@@ -3949,32 +3967,32 @@ msgstr "erreur de lecture du type"
msgid "wrong type (expected: %d, read: %d)"
msgstr "type erroné (attendu: %d, lu: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "nom de serveur non trouvé"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "session: chargement du serveur \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "serveur trouvé, mise à jour des valeurs\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "serveur non trouvé, création d'un nouveau\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "impossible de créer un nouveau serveur"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "fin de fichier inattendue (en lecture d'un serveur)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "erreur d'initialisation gnutls"
@@ -4441,44 +4459,44 @@ msgstr "afficher les actions avec différentes couleurs"
#: src/common/weeconfig.c:159
msgid "display nicklist window"
-msgstr "afficher la fenêtre des utilisateurs"
+msgstr "afficher la fenêtre des pseudos"
#: src/common/weeconfig.c:160
msgid "display nicklist window (for channel windows)"
-msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
+msgstr "afficher la fenêtre des pseudos (pour les fenêtres de canaux)"
#: src/common/weeconfig.c:163
msgid "nicklist position"
-msgstr "position de la fenêtre d'utilisateurs"
+msgstr "position de la fenêtre des pseudos"
#: src/common/weeconfig.c:164
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
-"position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
+"position de la fenêtre des pseudos (haut (top), gauche (left), droite "
"(right, par défaut), bas (bottom))"
#: src/common/weeconfig.c:167
msgid "min size for nicklist"
-msgstr "taille minimum pour la fenêtre d'utilisateurs"
+msgstr "taille minimum pour la fenêtre des pseudos"
#: src/common/weeconfig.c:168
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
msgstr ""
-"taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
+"taille minimum pour la fenêtre des pseudos (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille minimum))"
#: src/common/weeconfig.c:172
msgid "max size for nicklist"
-msgstr "taille maximum pour la fenêtre d'utilisateurs"
+msgstr "taille maximum pour la fenêtre des pseudos"
#: src/common/weeconfig.c:173
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
msgstr ""
-"taille maximum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
+"taille maximum pour la fenêtre des pseudos (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
"alors la taille est fixe))"
@@ -4489,17 +4507,16 @@ msgstr "séparateur entre la discussion et la liste de pseudos"
#: src/common/weeconfig.c:181 src/common/weeconfig.c:182
msgid "text to display instead of nick when not connected"
msgstr ""
-"texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
-"n'est pas active"
+"texte à afficher en lieu et place du pseudo lorsque la connexion n'est pas "
+"active"
#: src/common/weeconfig.c:185 src/common/weeconfig.c:186
msgid "display nick mode ((half)op/voice) before each nick"
-msgstr ""
-"afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
+msgstr "afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur"
#: src/common/weeconfig.c:189 src/common/weeconfig.c:190
msgid "display space if nick mode is not (half)op/voice"
-msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
+msgstr "afficher un espace si le mode du pseudo n'est pas (half)op/voice"
#: src/common/weeconfig.c:193 src/common/weeconfig.c:194
msgid "text to display before nick in chat window"
@@ -4673,7 +4690,7 @@ msgstr "couleur pour la barre de titre"
#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
msgid "color for '+' when scrolling topic"
-msgstr "couleur pour les '+' lors du scroll sur le titre"
+msgstr "couleur pour les '+' lors du défilement du titre"
#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
msgid "background for title bar"
@@ -4721,12 +4738,11 @@ msgstr "couleur pour la flèche du part/quit (préfixe)"
#: src/common/weeconfig.c:408
msgid "color for nicks in actions"
-msgstr "couleur pour les noms d'utilisateurs dans les actions"
+msgstr "couleur pour les pseudos dans les actions"
#: src/common/weeconfig.c:409
msgid "color for nicks in actions (chat window)"
-msgstr ""
-"couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
+msgstr "couleur pour les pseudos dans les actions (fenêtre de discussion)"
#: src/common/weeconfig.c:412
msgid "color for hostnames"
@@ -4918,7 +4934,7 @@ msgstr "couleur pour le symbole voix"
#: src/common/weeconfig.c:556 src/common/weeconfig.c:557
msgid "color for '+' when scrolling nicks"
-msgstr "couleur pour les '+' lors du scroll sur les pseudos"
+msgstr "couleur pour les '+' lors du défilement des pseudos"
#: src/common/weeconfig.c:560 src/common/weeconfig.c:561
msgid "color for nick separator"
@@ -5697,3 +5713,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+
+#~ msgid "unknown"
+#~ msgstr "inconnu"
diff --git a/weechat/po/hu.po b/weechat/po/hu.po
index 751251412..d4bfb045a 100644
--- a/weechat/po/hu.po
+++ b/weechat/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -16,93 +16,93 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "A felhasználónév meghatározása sikertelen"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s az új szerver lefoglalása sikertelen\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s adatküldési hiba az IRC szerveren\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(üzenet eldobva)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s nincs elegendő memória a fogadott IRC üzenet számára\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Parancs \"%s\" sikertelen!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s A futtatandó parancs nem található!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
"%s Ismeretlen parancs: parancs=\"%s\", hoszt=\"%s\", argumentum=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s nem sikerült adatot olvasni a csatornából, kilépés a szerverről...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Újracsatlakozás a szerverhez %d másodperc múlva\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls kézfogás sikertelen\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s proxy cím \"%s\" nem található\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s cím \"%s\" nem található\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s proxy IP-cím nem található\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-cím nem található\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s a proxy kiszolgálóhoz való csatlakozás elutasítva\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s a csatlakozás elutasítva\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -111,12 +111,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:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s nem sikerült a helyi hosztnevet/IP-t beállítani\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -124,61 +124,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:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, 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:1771
+#: src/irc/irc-server.c:1777
#, 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:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls inicializációs hiba\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, 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:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nem sikerült a csatornát létrehozni\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, 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:1841
+#: src/irc/irc-server.c:1848
#, 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:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Újracsatlakozás a szerverhez...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Lekapcsolódott a szerverről!\n"
@@ -1378,7 +1378,7 @@ msgstr "ki"
msgid " (temporary server, will not be saved)"
msgstr " (átmeneti szerver, nem lesz mentve)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "másodperc"
@@ -1431,7 +1431,7 @@ msgstr "%s nincs elég memória a reguláris kifejezéshez\n"
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:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n"
@@ -1454,60 +1454,60 @@ msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, lefordítva: %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Meghívást kapott a %s%s%s szobába %s%s felhasználótól\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s nem sikerült új szobát nyitni \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s belépett a(z) %s%s szobába\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s eltávolította %s%s%s-t a szerverről"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s a(z) \"%s\" hoszt nem található a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" parancs érkezett hoszt megadása nélkül\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" parancs érkezett szoba vagy név megadása nélkül\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr ""
@@ -1591,11 +1591,11 @@ msgstr "%s szoba: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
@@ -1605,238 +1605,256 @@ msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
msgid "%s unknown DCC CHAT type received from "
msgstr "%s usmeretlen DCC CHAT típus érkezett a következőtől:"
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s kilépett"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" parancs érkezett szoba megadása nélkül\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s törölte a %s%s szoba témáját\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "%s%s%s felhasználói módja: %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s távol: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Online felhasználók: "
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s segítség mód (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s neve %s volt\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s tétlen: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "nap"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "nap"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, bejelentkezett: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "óra"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "óra"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "perc"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "perc"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "másodperc"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Szoba létrehozva: %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s nem sikerült a dátumot/időt meghatározni a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s nem sikerült azonosítani a szobát a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Nincs téma beállítva a %s%s szobában\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "A %s%s%s szoba témája: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "A témát beállította: %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s nem sikerült a felhasználót meghatározni a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr ""
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr ""
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Felhasználók a %s%s%s szobában: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s nem sikerült a(z) \"%s\" nevet felvenni a \"%s\" szobában\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"%s%s%s szoba: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "név"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "név"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "operátor"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "operátor"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "normál"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s-t kitiltotta "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s kitiltva\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: 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:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
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:4851
-msgid "unknown"
-msgstr "ismeretlen"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Várakozás"
@@ -3906,32 +3924,32 @@ msgstr "típus olvasási hiba"
msgid "wrong type (expected: %d, read: %d)"
msgstr "rossz típus (várt: %d, beolvasott: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "a szerver neve nem található"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "folyamat: \"%s\" szerver betöltése\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "megvan a szerver, értékek frissítése\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "a szerver nem található, új szerver készítése\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "nem sikerült új szervert készíteni"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "váratlan fájlvég (szerver olvasása)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "gnutls inicializációs hiba"
@@ -5623,3 +5641,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Beállítások mentése a lemezre\n"
+
+#~ msgid "unknown"
+#~ msgstr "ismeretlen"
diff --git a/weechat/po/ru.po b/weechat/po/ru.po
index 8a10953bb..326c0a7e7 100644
--- a/weechat/po/ru.po
+++ b/weechat/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: 2007-04-24 12:43+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -15,92 +15,92 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr "Не могу получить имя пользователя"
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s не могу расположить новый сервер\n"
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s ошибка при отправке данных IRC серверу\n"
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr "(сообщение отброшено)"
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s недостаточно памяти для полученного сообщения\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Команда \"%s\" не удалась!\n"
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Нет команд для запуска!\n"
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
"%s Неизвестная команда: команда=\"%s\", хост=\"%s\", аргументы=\"%s\"\n"
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s невозможно прочитать данные из сокета, отключаюсь от сервера...\n"
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Повторное подключение к серверу через %d секунд\n"
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s инициализация gnutls не удалось\n"
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s proxy \"%s\" не найден\n"
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s адрес \"%s\" не найден\n"
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP адрес proxy-сервера не найден\n"
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP адрес не найден\n"
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s в подключении к proxy-серверу отказано\n"
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr "%s в подключении отказано\n"
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -109,12 +109,12 @@ msgstr ""
"%s proxy-сервер не смог установить соединение с сервером (проверьте имя "
"пользователя и пароль если они используются)\n"
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s не могу установить локальный хост/IP\n"
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -122,57 +122,57 @@ msgstr ""
"%s невозможно соединиться с использованием SSL, так как WeeChat собран без "
"поддержки GNUtls\n"
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, 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:1757
+#: src/irc/irc-server.c:1763
#, 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:1767
+#: src/irc/irc-server.c:1773
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1771
+#: src/irc/irc-server.c:1777
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Подключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s ошибка инициализации gnutls\n"
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s не могу создать pipe\n"
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s невозможно создать сокет\n"
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Повторное соединение...\n"
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr "Отключен от сервера!\n"
@@ -1365,7 +1365,7 @@ msgstr "выкл."
msgid " (temporary server, will not be saved)"
msgstr " (временный сервер, не будет сохранён)"
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr "секунды"
@@ -1419,7 +1419,7 @@ msgid "%s \"%s\" command can only be executed in a channel or private buffer\n"
msgstr ""
"%s \"%s\" команда может быть выполнена только в буфере канала или привата\n"
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s ник \"%s\" не найден для команды \"%s\"\n"
@@ -1442,60 +1442,60 @@ msgstr "%s невозможно создать новый буфер прива
msgid "%s, compiled on %s %s\n"
msgstr "%s, собран %s %s\n"
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr "Вас пригласил на %s%s%s пользователь %s%s\n"
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s канал \"%s\" не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr "%s не могу создать новый канал \"%s\"\n"
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr "%s%s %s(%s%s%s)%s зашёл на канал %s%s\n"
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr "%s%s%s убил %s%s%s"
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s хост \"%s\" не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" команда получена без хоста\n"
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" команда получена без канала или ника\n"
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr "Режим %s%s %s[%s%s%s]%s установлен пользователем %s%s\n"
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr "Режим %s[%s%s%s]%s пользователем %s%s\n"
@@ -1579,11 +1579,11 @@ msgstr "Канал %s: %s> %s"
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s не могу проанализировать команду \"%s\"\n"
@@ -1593,238 +1593,256 @@ msgstr "%s не могу проанализировать команду \"%s\"\
msgid "%s unknown DCC CHAT type received from "
msgstr "%s неизвестный режим DCC CHAT получен от "
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr "%s%s %s(%s%s%s)%s вышел"
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" команда получена без канала\n"
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr "%s%s%s сменил тему %s%s%s на:"
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr "%s%s%s удалил тему канала для %s%s\n"
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr "WALLOPы от %s%s%s: %s\n"
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Режим пользователя %s%s%s - %s[%s%s%s]\n"
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s отсутствует: %s\n"
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr "Пользователей в сети:"
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr "%s[%s%s%s]%s режим помощи (+h)\n"
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr "%s%s %s(%s%s@%s%s)%s был %s\n"
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s бездействует: "
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr "дней"
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr "день"
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, вошёл в сеть: %s%s"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr "часов"
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr "час"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr "минут"
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr "минута"
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr "секунда"
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr "Канал создан %s"
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s не могу опознать дату/время для команды \"%s\"\n"
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s не могу опознать канал для команды \"%s\"\n"
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Не установлена тема канала для %s%s\n"
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Тема канала %s%s%s: "
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Тема установлена пользователем %s%s%s, %s"
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s не могу опознать ник для команды \"%s\"\n"
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n"
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Реоп канала %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr " пользователем %s%s %s(%s%s%s)"
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr " пользователем %s%s"
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Ники %s%s%s: %s["
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s не могу создать ник \"%s\" для канала \"%s\"\n"
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
"Канал %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr "ники"
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr "ник"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr "опы"
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr "оп"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr "полуопы"
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr "полуоп"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr "войсы"
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr "войс"
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr "обычные"
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr "%s[%s%s%s] %s%s%s забанен пользователем "
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr "%s[%s%s%s] %s%s%s забанен\n"
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\n"
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr "неизвестный"
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr "Ожидание"
@@ -3891,32 +3909,32 @@ msgstr "ошибка чтения типа"
msgid "wrong type (expected: %d, read: %d)"
msgstr "некорректный тип (ожидалось: %d, прочитано: %d)"
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr "имя сервера не найдено"
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr "сессия: загружаю сервер \"%s\"\n"
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr "сервер найден, обновляю значения\n"
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr "сервер не найден, создаю новый\n"
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr "невозможно создать новый сервер"
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr "неожиданный конец файла (при чтении сервера)"
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr "ошибка инициализации gnutls"
@@ -5613,3 +5631,6 @@ msgstr ""
#: src/common/weeconfig.c:2388
msgid "Saving config to disk\n"
msgstr "Сохраняю конфигурацию\n"
+
+#~ msgid "unknown"
+#~ msgstr "неизвестный"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index b3b2d7ad5..b1429e809 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: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,159 +15,159 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
msgid "Unable to get user's name"
msgstr ""
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
#, c-format
msgid "%s cannot allocate new server\n"
msgstr ""
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr ""
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
msgid "(message dropped)"
msgstr ""
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr ""
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr ""
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
#, c-format
msgid "%s No command to execute!\n"
msgstr ""
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr ""
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
#, c-format
msgid "%s proxy IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
#, c-format
msgid "%s IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
#, c-format
msgid "%s proxy connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
#, c-format
msgid "%s connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
"used)\n"
msgstr ""
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr ""
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1757
+#: src/irc/irc-server.c:1763
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1767
+#: src/irc/irc-server.c:1773
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1771
+#: src/irc/irc-server.c:1777
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1789
+#: src/irc/irc-server.c:1795
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
msgid "Disconnected from server!\n"
msgstr ""
@@ -1262,7 +1262,7 @@ msgstr ""
msgid " (temporary server, will not be saved)"
msgstr ""
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
msgid "seconds"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "%s \"%s\" command can only be executed in a channel or private buffer\n"
msgstr ""
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
@@ -1338,60 +1338,60 @@ msgstr ""
msgid "%s, compiled on %s %s\n"
msgstr ""
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
#, c-format
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
#, c-format
msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
#, c-format
msgid "%s%s%s has kicked %s%s%s from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
#, c-format
msgid "%s%s%s has killed %s%s%s from server"
msgstr ""
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
#: src/irc/irc-recv.c:2095
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
#, c-format
msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
#, c-format
msgid "User mode %s[%s%s%s]%s by %s%s\n"
msgstr ""
@@ -1475,11 +1475,11 @@ msgstr ""
#: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
#: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
#: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
@@ -1489,237 +1489,255 @@ msgstr ""
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr ""
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr ""
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
#, c-format
msgid "WALLOPS from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
#, c-format
msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr ""
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
#, c-format
msgid "%s[%s%s%s]%s help mode (+h)\n"
msgstr ""
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr ""
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
#, c-format
msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
msgstr ""
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
#, c-format
msgid "Channel created on %s"
msgstr ""
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
#, c-format
msgid "No topic set for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
#, c-format
msgid "Topic for %s%s%s is: "
msgstr ""
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr ""
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
#, c-format
msgid " by %s%s %s(%s%s%s)"
msgstr ""
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
#, c-format
msgid " by %s%s"
msgstr ""
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr ""
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
#, c-format
msgid ""
"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
msgstr ""
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr ""
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr ""
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4822
+#, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4833
+#, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4844
+#, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4873
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr ""
-
#: src/irc/irc-dcc.c:55
msgid "Waiting"
msgstr ""
@@ -3605,32 +3623,32 @@ msgstr ""
msgid "wrong type (expected: %d, read: %d)"
msgstr ""
-#: src/common/session.c:835
+#: src/common/session.c:834
msgid "server name not found"
msgstr ""
-#: src/common/session.c:840
+#: src/common/session.c:839
#, c-format
msgid "session: loading server \"%s\"\n"
msgstr ""
-#: src/common/session.c:844
+#: src/common/session.c:843
msgid "server found, updating values\n"
msgstr ""
-#: src/common/session.c:847
+#: src/common/session.c:846
msgid "server not found, creating new one\n"
msgstr ""
-#: src/common/session.c:852
+#: src/common/session.c:851
msgid "can't create new server"
msgstr ""
-#: src/common/session.c:866
+#: src/common/session.c:865
msgid "unexpected end of file (reading server)"
msgstr ""
-#: src/common/session.c:957
+#: src/common/session.c:956
msgid "gnutls init error"
msgstr ""
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index 51e9e542a..923019237 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -428,7 +428,7 @@ t_irc_command irc_commands[] =
{ "431", N_("no nickname given"), "", "",
NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "432", N_("erroneous nickname"), "", "",
- NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
+ NULL, 0, 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_432 },
{ "433", N_("nickname already in use"), "", "",
NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_433 },
{ "436", N_("nickname collision"), "", "",
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 7fba01650..b1d1b9e94 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -326,69 +326,63 @@ irc_recv_command (t_irc_server *server, char *entire_line,
int
irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos2;
+ char *pos;
int first;
t_gui_buffer *ptr_buffer;
t_irc_channel *ptr_channel;
/* make C compiler happy */
- (void) server;
(void) host;
(void) nick;
- if (strncmp (arguments, "Closing Link", 12) == 0)
- {
- server_disconnect (server, 1);
- return 0;
- }
-
- pos = strchr (arguments, ' ');
- if (pos)
- {
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
- }
- else
- pos = arguments;
-
first = 1;
-
ptr_buffer = server->buffer;
- while (pos && pos[0])
+
+ while (arguments && arguments[0])
{
- pos2 = strchr (pos, ' ');
- if ((pos[0] == ':') || (!pos2))
+ while (arguments[0] == ' ')
+ arguments++;
+
+ if (arguments[0] == ':')
{
- if (pos[0] == ':')
- pos++;
+ arguments++;
if (first)
irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
gui_printf (ptr_buffer, "%s%s%s\n",
GUI_COLOR(COLOR_WIN_CHAT),
(first) ? "" : ": ",
- pos);
- pos = NULL;
+ arguments);
+ if (strncmp (arguments, "Closing Link", 12) == 0)
+ server_disconnect (server, 1);
+ arguments = NULL;
}
else
{
- pos2[0] = '\0';
- if (first)
+ pos = strchr (arguments, ' ');
+ if (pos)
+ pos[0] = '\0';
+ if (strcmp (arguments, server->nick) != 0)
{
- ptr_channel = channel_search (server, pos);
- if (ptr_channel)
- ptr_buffer = ptr_channel->buffer;
- irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
+ if (first)
+ {
+ ptr_channel = channel_search (server, arguments);
+ if (ptr_channel)
+ ptr_buffer = ptr_channel->buffer;
+ irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
+ }
+ gui_printf (ptr_buffer, "%s%s%s",
+ GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+ (first) ? "" : " ",
+ arguments);
+ first = 0;
}
- gui_printf (ptr_buffer, "%s%s%s",
- GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
- (first) ? "" : " ",
- pos);
- first = 0;
- pos = pos2 + 1;
+ if (pos)
+ arguments = pos + 1;
+ else
+ arguments = NULL;
}
}
+
return 0;
}
@@ -452,6 +446,9 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
char *pos;
+
+ if (arguments[0] == ':')
+ arguments++;
command_ignored |= ignore_check (host, "join", arguments, server->name);
@@ -795,6 +792,9 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *nick, char *arguments
WEECHAT_ERROR, "nick");
return -1;
}
+
+ if (arguments[0] == ':')
+ arguments++;
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
@@ -2096,6 +2096,9 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *nick, char *arguments
WEECHAT_ERROR, "quit");
return -1;
}
+
+ if (arguments[0] == ':')
+ arguments++;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
@@ -2196,6 +2199,9 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *nick, char *arg
if (!command_ignored)
{
+ while (arguments[0] == ' ')
+ arguments++;
+
/* skip nickname if at beginning of server message */
if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
{
@@ -4786,14 +4792,76 @@ irc_cmd_recv_378 (t_irc_server *server, char *host, char *nick, char *arguments)
}
/*
+ * irc_cmd_recv_432: '432' command received (erroneous nickname)
+ */
+
+int
+irc_cmd_recv_432 (t_irc_server *server, char *host, char *nick, char *arguments)
+{
+ /* Note: this IRC command can not be ignored */
+
+ irc_cmd_recv_error (server, host, nick, arguments);
+
+ if (!server->is_connected)
+ {
+ if (strcmp (server->nick, server->nick1) == 0)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: trying 2nd nickname \"%s\"\n"),
+ PACKAGE_NAME, server->nick2);
+ free (server->nick);
+ server->nick = strdup (server->nick2);
+ }
+ else
+ {
+ if (strcmp (server->nick, server->nick2) == 0)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: trying 3rd nickname \"%s\"\n"),
+ PACKAGE_NAME, server->nick3);
+ free (server->nick);
+ server->nick = strdup (server->nick3);
+ }
+ else
+ {
+ if (strcmp (server->nick, server->nick3) == 0)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: all declared nicknames are already in "
+ "use or invalid, closing connection with "
+ "server!\n"),
+ PACKAGE_NAME);
+ server_disconnect (server, 1);
+ return 0;
+ }
+ else
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("%s: trying 1st nickname \"%s\"\n"),
+ PACKAGE_NAME, server->nick1);
+ free (server->nick);
+ server->nick = strdup (server->nick1);
+ }
+ }
+ }
+ server_sendf (server,
+ "NICK %s",
+ server->nick);
+ }
+ return 0;
+}
+
+/*
* irc_cmd_recv_433: '433' command received (nickname already in use)
*/
int
irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char hostname[128];
-
/* Note: this IRC command can not be ignored */
if (!server->is_connected)
@@ -4803,7 +4871,7 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: nickname \"%s\" is already in use, "
- "trying 2nd nickname \"%s\"\n"),
+ "trying 2nd nickname \"%s\"\n"),
PACKAGE_NAME, server->nick, server->nick2);
free (server->nick);
server->nick = strdup (server->nick2);
@@ -4815,7 +4883,7 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: nickname \"%s\" is already in use, "
- "trying 3rd nickname \"%s\"\n"),
+ "trying 3rd nickname \"%s\"\n"),
PACKAGE_NAME, server->nick, server->nick3);
free (server->nick);
server->nick = strdup (server->nick3);
@@ -4827,7 +4895,7 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: all declared nicknames are already in use, "
- "closing connection with server!\n"),
+ "closing connection with server!\n"),
PACKAGE_NAME);
server_disconnect (server, 1);
return 0;
@@ -4837,18 +4905,13 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
irc_display_prefix (server, server->buffer, PREFIX_INFO);
gui_printf (server->buffer,
_("%s: nickname \"%s\" is already in use, "
- "trying 1st nickname \"%s\"\n"),
+ "trying 1st nickname \"%s\"\n"),
PACKAGE_NAME, server->nick, server->nick1);
free (server->nick);
server->nick = strdup (server->nick1);
}
}
}
-
- gethostname (hostname, sizeof (hostname) - 1);
- hostname[sizeof (hostname) - 1] = '\0';
- if (!hostname[0])
- strcpy (hostname, _("unknown"));
server_sendf (server,
"NICK %s",
server->nick);
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index 78175dc81..5a4c25f2e 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -771,8 +771,6 @@ server_parse_message (char *message, char **host, char **command, char **args)
pos2++;
while (pos2[0] == ' ')
pos2++;
- if (pos2[0] == ':')
- pos2++;
*args = strdup (pos2);
}
}
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index 8eb26cb4c..0090f5c3f 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -604,6 +604,7 @@ extern int irc_cmd_recv_366 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_367 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_368 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_378 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_432 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_433 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_438 (t_irc_server *, char *, char *, char *);
extern int irc_cmd_recv_671 (t_irc_server *, char *, char *, char *);
diff --git a/weechat/src/plugins/charset/weechat-charset.c b/weechat/src/plugins/charset/weechat-charset.c
index 0941d6ecd..58443e9f6 100644
--- a/weechat/src/plugins/charset/weechat-charset.c
+++ b/weechat/src/plugins/charset/weechat-charset.c
@@ -234,11 +234,9 @@ weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
pos2++;
while (pos2[0] == ' ')
pos2++;
- if (pos2[0] == ':')
- *pos_args = pos2 + 1;
- else
+ *pos_args = pos2;
+ if (pos2[0] != ':')
{
- *pos_args = pos2;
if ((pos2[0] == '#') || (pos2[0] == '&')
|| (pos2[0] == '+') || (pos2[0] == '!'))
{