diff --git a/ChangeLog b/ChangeLog
index c06e3c792..837da38fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2006-08-05
+ChangeLog - 2006-08-08
Version 0.2.0 (under dev!):
+ * added missing modes (channel & user), now all modes are allowed (bug #16606)
+ * added "%m" for completion with self nick (on current server)
* added missing IRC command 338
* fixed DCC restore after /upgrade (order is now correctly saved)
* fixed away after server disconnection (now away is set again when
diff --git a/doc/de/weechat.de.xml b/doc/de/weechat.de.xml
index 07c5534ae..083ef6294 100644
--- a/doc/de/weechat.de.xml
+++ b/doc/de/weechat.de.xml
@@ -1991,6 +1991,10 @@ plugin->msg_handler_add (plugin, "KICK", &msg_kick, NULL, NULL);
%k
Grundfunktionen
+
+ %m
+ Nicknamen des gegenwrtigen Servers
+
%n
Nicknamen des gegenwrtigen Channels
diff --git a/doc/en/weechat.en.xml b/doc/en/weechat.en.xml
index 9432f1e38..d27258cc4 100644
--- a/doc/en/weechat.en.xml
+++ b/doc/en/weechat.en.xml
@@ -2008,6 +2008,10 @@ plugin->msg_handler_add (plugin, "KICK", &msg_kick, NULL, NULL);
%k
key functions
+
+ %m
+ nick on current server
+
%n
nicks of current channel
diff --git a/doc/fr/weechat.fr.xml b/doc/fr/weechat.fr.xml
index 82eb1cc22..c05258ce5 100644
--- a/doc/fr/weechat.fr.xml
+++ b/doc/fr/weechat.fr.xml
@@ -2049,6 +2049,10 @@ plugin->msg_handler_add (plugin, "KICK", &msg_kick, NULL, NULL);
%k
fonctions associes aux touches
+
+ %m
+ pseudo sur le serveur courant
+
%n
pseudos du canal courant
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9b55f49d2..d38d300ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+./src/irc/irc-mode.c
./src/irc/irc-nick.c
./src/irc/irc-server.c
./src/irc/irc-channel.c
@@ -67,6 +68,8 @@
./src/common/session.h
./src/common/utf8.c
./src/common/utf8.h
+./src/common/util.c
+./src/common/util.h
./src/common/weechat.c
./src/common/weechat.h
./src/common/weeconfig.c
diff --git a/po/cs.po b/po/cs.po
index 496fa5824..cf26ae34e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-07-25 20:00+0200\n"
"Last-Translator: Jiri Golembiovsky \n"
"Language-Team: weechat-dev \n"
@@ -14,87 +14,87 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Nemůžu získat jméno uživatele"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s nemůžu přidělit nový server\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Příkaz \"%s\" selhal\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Žádný příkaz pro provedení!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s handshake s gnutls selhal\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresa proxy \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresa \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP adresa proxy nenalezena\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP adresa nenalezena\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s proxy odmítla spojení\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s spojení odmítnuto\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -103,12 +103,12 @@ msgstr ""
"%s selhalo zjednání spojení s proxy serverem (zkontrolujte uživatelské jméno "
"a heslo pokud jsou vyžadovány)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, 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:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -116,57 +116,57 @@ msgstr ""
"%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou "
"GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s chyba inicializace gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s nemohu vytvořit rouru\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nemohu vytvořit soket\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Připojuji se znovu k serveru...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Odpojen od serveru!\n"
@@ -1351,7 +1351,7 @@ msgstr "off"
msgid " (temporary server, will not be saved)"
msgstr " (dočasný server, nebude uložen)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "sekund"
@@ -1434,9 +1434,9 @@ msgstr "%s, kompilováno na %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n"
@@ -1466,489 +1466,307 @@ msgstr "%s%s%s byl zabit %s%s%s ze serveru"
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:685
-msgid "sets ban on"
-msgstr "tě zakázal"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "odebral zakázaní"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "nastavil povolení zakázání skutečného jména"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "odebral povolení zakázaní skutečného jména"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "nastavena vyjímka zakázání na"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "odstraněna vyjímka zakázání z"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "nastavil mód +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "odstranil mód +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "dal poloviční status operátora na"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "odebral poloviční status operátora z"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "nastavil zančku kanálu: pouze na pování"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "odebral značku kanálu: pouze na pozvání"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "nastavena vyjímka pouze na pozvání na"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "odstraněna vyjímka pouze na pozvání z"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "nastavil klíč kanálu na"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "odebral klíč kanálu"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "nastavil limit uživatelů na"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "odebral limit uživatelů"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "nastavil značku moderovaného kanálu"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "odebral značku moderovaného kanálu"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "nastavil značku kanálu: zprávy pouze z kanálu"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "odebral značku kanálu: zprávy pouze z kanálu"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "dal status operátora na"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "odebral status operátora z"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "nastavil značku soukromého kanálu"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "odebral značku soukromého kanálu"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "nastavil ticho na"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "odebral ticho z"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "nastavil značku tajného kanálu"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "odebral značku tajného kanálu"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "nastavil protekci tématu"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "odebral protekci tématu"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "dal voice na"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "odebral voice z"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "nastavil nepřítomnost"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "odebral nepřítomnost"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "nastavil neviditelnost"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "odebral neviditelnost"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "nastavil wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "odebral wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "nastavil soukromý"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "odebral soukromý"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "nastavil operátora"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "odebral operátora"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "nastavil lokálního operátora"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "odebral lokálního operátora"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "nastavil upozornění serveru"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "odebrat upozornění serveru"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, 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:1251
+#: src/irc/irc-recv.c:674
#, 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:1354
+#: src/irc/irc-recv.c:702
+#, 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 byl %s\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Uživatelský mód %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Nyní známý jako %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s nyní známý jako %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s přezdívka nenalezena pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s odpověď od %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s odpověď od %s%s%s: %ld.%ld sekund\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s nemohu vytvořít nové soukromé okno\"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Soukromý"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s \"%s\" příkaz obdržen bez hosta nebo kanálu\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s opustil %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Kanálu"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Obdržen CTCP %sZVUK%s \"%s\" od %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s obdržen od %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "Neznámý CTCP %s%s%s obdržen od %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s obdržen od %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s neznámý DCC CHAT typ obdržen od "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, 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:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, c-format
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Uživatelský mód %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s je pryč: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Uživatelů online: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s nečinný: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "dní"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "den"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "hodin"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "hodina"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "minut"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "minuta"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "sekunda"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Není nastaveno téma pro %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Téma pro %s%s%s je: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Téma nastevil %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Přezdívkz %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, 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:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "přezdívky"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "přezdívka"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "částeční-ops"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "částečný-op"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normální"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1957,13 +1775,13 @@ 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:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "neznámý"
@@ -2390,27 +2208,27 @@ msgstr "GB"
msgid "ETA"
msgstr "ETA"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Akceptovat"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Storno"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Odebrat"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Zavřít čistý pohled na data"
@@ -2432,28 +2250,28 @@ msgstr ""
msgid "(away)"
msgstr "(pryč)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[nepřipojen] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr "<ČISTÉ_IRC> "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Aktivní: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "ČISTÉ_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Zpoždění: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-VÍCE-"
@@ -2461,7 +2279,7 @@ msgstr "-VÍCE-"
msgid "server"
msgstr "server"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Nedostatek paměti pro nový řádek\n"
@@ -5727,6 +5545,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Ukládám konfiguraci na disk\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Uživatelský mód %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "nastavil nepřítomnost"
+
+#~ msgid "removes away"
+#~ msgstr "odebral nepřítomnost"
+
+#~ msgid "sets invisible"
+#~ msgstr "nastavil neviditelnost"
+
+#~ msgid "removes invisible"
+#~ msgstr "odebral neviditelnost"
+
+#~ msgid "sets wallops"
+#~ msgstr "nastavil wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "odebral wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "nastavil soukromý"
+
+#~ msgid "removes restricted"
+#~ msgstr "odebral soukromý"
+
+#~ msgid "sets operator"
+#~ msgstr "nastavil operátora"
+
+#~ msgid "removes operator"
+#~ msgstr "odebral operátora"
+
+#~ msgid "sets local operator"
+#~ msgstr "nastavil lokálního operátora"
+
+#~ msgid "removes local operator"
+#~ msgstr "odebral lokálního operátora"
+
+#~ msgid "sets server notices"
+#~ msgstr "nastavil upozornění serveru"
+
+#~ msgid "removes server notices"
+#~ msgstr "odebrat upozornění serveru"
+
+#~ msgid "sets ban on"
+#~ msgstr "tě zakázal"
+
+#~ msgid "removes ban on"
+#~ msgstr "odebral zakázaní"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "nastavil povolení zakázání skutečného jména"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "odebral povolení zakázaní skutečného jména"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "nastavena vyjímka zakázání na"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "odstraněna vyjímka zakázání z"
+
+#~ msgid "sets mode +f"
+#~ msgstr "nastavil mód +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "odstranil mód +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "dal poloviční status operátora na"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "odebral poloviční status operátora z"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "nastavil zančku kanálu: pouze na pování"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "odebral značku kanálu: pouze na pozvání"
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "nastavena vyjímka pouze na pozvání na"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "odstraněna vyjímka pouze na pozvání z"
+
+#~ msgid "sets channel key to"
+#~ msgstr "nastavil klíč kanálu na"
+
+#~ msgid "removes channel key"
+#~ msgstr "odebral klíč kanálu"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "nastavil limit uživatelů na"
+
+#~ msgid "removes user limit"
+#~ msgstr "odebral limit uživatelů"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "nastavil značku moderovaného kanálu"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "odebral značku moderovaného kanálu"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "nastavil značku kanálu: zprávy pouze z kanálu"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "odebral značku kanálu: zprávy pouze z kanálu"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "dal status operátora na"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "odebral status operátora z"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "nastavil značku soukromého kanálu"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "odebral značku soukromého kanálu"
+
+#~ msgid "sets quiet on"
+#~ msgstr "nastavil ticho na"
+
+#~ msgid "removes quiet on"
+#~ msgstr "odebral ticho z"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "nastavil značku tajného kanálu"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "odebral značku tajného kanálu"
+
+#~ msgid "sets topic protection"
+#~ msgstr "nastavil protekci tématu"
+
+#~ msgid "removes topic protection"
+#~ msgstr "odebral protekci tématu"
+
+#~ msgid "gives voice to"
+#~ msgstr "dal voice na"
+
+#~ msgid "removes voice from"
+#~ msgstr "odebral voice z"
+
#~ msgid "Kb"
#~ msgstr "Kb"
diff --git a/po/de.po b/po/de.po
index 21b1d9fa2..40337693f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
-"PO-Revision-Date: 2006-07-30 19:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
+"PO-Revision-Date: 2006-08-07 18:36+0200\n"
"Last-Translator: Thomas Schuetz \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,87 +18,87 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Username konnte nicht ermittelt werden"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s Neuer Server konnte nicht alloziert werden\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s der Befehl \"%s\" schlug fehl!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Kein Befehl zum Ausführen!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Neuverbinden in %d Sekunden\n"
-#: src/irc/irc-server.c:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls-Handshake schlug fehl\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s Proxyadresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s Adresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s Proxy-IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s Proxyverbindung verweigert\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s Verbindungsaufbau verweigert\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -107,12 +107,12 @@ msgstr ""
"%s Der Proxy konnte die Verbindung zum Server nicht aufbauen (bitte "
"Benutzername/Passwort überprüfen)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, 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:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -120,57 +120,57 @@ msgstr ""
"%s SSL-Verbindung nicht möglich, da WeeChat nicht mit GNUtls-Support "
"kompiliert wurde\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls Initialisierungsfehler\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s Pipe konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s Socket konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Neuverbinden zum Server...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Vom Server getrennt!\n"
@@ -1047,9 +1047,8 @@ msgid "infos about topic (nick and date changed)"
msgstr "Topic-Informationen (Nick und Änderungsdatum)"
#: src/irc/irc-commands.c:361
-#, fuzzy
msgid "whois (host)"
-msgstr "whois (Benutzername)"
+msgstr "whois (Host)"
#: src/irc/irc-commands.c:363
msgid "inviting"
@@ -1351,7 +1350,7 @@ msgstr "aus"
msgid " (temporary server, will not be saved)"
msgstr " (temporärer Server, wird nicht gespeichert)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "Sekunden"
@@ -1435,9 +1434,9 @@ msgstr "%s, kompiliert auf %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s Channel \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
@@ -1467,490 +1466,308 @@ msgstr "%s%s%s hat %s%s%s vom Server getrennt"
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:685
-msgid "sets ban on"
-msgstr "verbannt"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "entbannt"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "setzt Realnamenbann für"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "entfernt Realnamenbann von"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "setzt Bann-Ausnahme für"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "entfernt Bann-Ausnahme für"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "setzt Channelmodus +f (forward on uninvited)"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "entfernt Channelmodus +f (forward on uninvited)"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "verleiht Halboperatorstatus an"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "entfernt den Halboperatorstatus von"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "setzt das Flag \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "entfernt das Flag \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "setzt Ausnahme für \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "entfernt Ausnahme für \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "setzt den Channelkey auf"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "entfernt den Channelkey"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "setzt das Userlimit auf"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "entfernt das Userlimit"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "setzt den Channel auf moderiert"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "entfernt das moderiert-Flag"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "blockiert Nachrichten von außen"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "erlaubt Nachrichten von außen"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "verleiht Operatorstatus an"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "aberkennt den Operatorstatus von"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "setzt das privat-Flag"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "entfernt das privat-Flag"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "setzt das quiet-Flag"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "entfernt das quiet-Flag"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "setzt das geheim-Flag"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "entfernt das geheim-Flag"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "sperrt das Topic"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "gibt das Topic frei"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "vergibt Voice an"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "entfernt Voice von"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "aktiviert Abwesenheitsstatus"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "deaktiviert Abwesenheitsstatus"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "aktiviert Unsichtbarkeitsstatus"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "deaktiviert Unsichtbarkeitsstatus"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "aktiviert den Empfang von Wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "deaktiviert den Empfang von Wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "aktiviert die eingeschränkte Verbindung"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "deaktiviert die eingeschränkte Verbindung"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "vergibt Operatorstatus"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "entfernt Operatorstatus"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "vergibt lokalen Oeratorstatus"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "entfernt lokalen Operatorstatus"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "aktiviert Servernachrichten"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "deaktiviert Servernachrichten"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Host\n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, 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:1354
+#: src/irc/irc-recv.c:702
+#, 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 war %s\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Usermodus %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Sie sind nun als %s%s bekannt\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s ist nun bekannt als %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s Nickname nicht gefunden für den \"%s\"-Befehl\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s Antwort von %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s Antwort von %s%s%s: %ld.%ld Sekunden\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Privat:"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Host oder Channel\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s verlässt %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Channel"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Ein CTCP %sSOUND%s \"%s\" wurde von %s%s empfangen\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s wurde von %s%s empfangen\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "Unbekannter CTCP %s%s%s von %s%s empfangen"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s von %s%s empfangen"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s unbekannter DCC CHAT-Typ emfpangen von "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Channel\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, c-format
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Usermodus %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s ist abwesend: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "User online: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s idlet: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "Tage"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "Tag"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "Stunden"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "Stunde"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "Minuten"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "Minute"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "Sekunde"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Kein Topic gesetzt für %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Das Topic von %s%s%s lautet: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Topic gesetzt von %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Nicks %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, 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:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "Nicks"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "Nick"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "Operatoren"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "Operator"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "Halb-Operatoren"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "Halb-Operator"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "Gevoicete"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "Gevoiceter"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1959,13 +1776,13 @@ msgstr ""
"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
"getrennt!\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "unbekannt"
@@ -2136,59 +1953,59 @@ msgid "Private %s> %s"
msgstr "Privat %s> %s"
#: src/irc/irc-dcc.c:1370
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to create pipe\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann keine Pipe erstellen\n"
#: src/irc/irc-dcc.c:1598
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to read local file\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann lokale Datei nicht lesen\n"
#: src/irc/irc-dcc.c:1605
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to send block to receiver\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann den Block nicht an den Empfänger übertragen\n"
#: src/irc/irc-dcc.c:1612
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to read ACK from receiver\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann kein ACK vom Empfänger empfangen\n"
#: src/irc/irc-dcc.c:1620
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to connect to sender\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann keine Verbindung zum Sender herstellen\n"
#: src/irc/irc-dcc.c:1627
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to receive block from sender\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann Block nicht vom Sender empfangen\n"
#: src/irc/irc-dcc.c:1634
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to write local file\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann lokalen Datei nicht schreiben\n"
#: src/irc/irc-dcc.c:1687 src/irc/irc-dcc.c:1730
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to fork\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann nicht forken\n"
#: src/irc/irc-dcc.c:1770
#, c-format
msgid "%s DCC: timeout\n"
-msgstr ""
+msgstr "%s DCC: Timeout\n"
#: src/irc/irc-dcc.c:1802
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to create socket for sending file\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann keinen Socket für den Dateiversand erstellen\n"
#: src/irc/irc-dcc.c:1814
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to set 'nonblock' option for socket\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n"
#: src/irc/irc-dcc.c:1898
#, c-format
@@ -2384,48 +2201,48 @@ msgstr "Bytes"
#: src/gui/curses/gui-curses-chat.c:880
msgid "KB"
-msgstr ""
+msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:880
msgid "MB"
-msgstr ""
+msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:880
msgid "GB"
-msgstr ""
+msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1012
msgid "ETA"
msgstr "ETA"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] annehmen"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] abbrechen"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] entfernen"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] alte DCCs entfernen"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] DCC-Ansicht schließen"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Rohdatenansicht schließen"
#: src/gui/curses/gui-curses-main.c:99
#, c-format
msgid "Day changed to %s\n"
-msgstr "Ein neuer Tag bricht hat, heute ist der %s\n"
+msgstr "Ein neuer Tag bricht an, heute ist der %s\n"
#: src/gui/curses/gui-curses-main.c:214
#, c-format
@@ -2440,28 +2257,28 @@ msgstr ""
msgid "(away)"
msgstr "(abwesend)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[nicht verbunden]"
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Aktiv: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "RAW_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-MEHR-"
@@ -2469,7 +2286,7 @@ msgstr "-MEHR-"
msgid "server"
msgstr "Server"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Nicht genügend Speicher für neue Zeile\n"
@@ -5264,9 +5081,8 @@ msgid "block size for dcc packets in bytes (default: 65536)"
msgstr "Blockgröße für DCCs"
#: src/common/weeconfig.c:831 src/common/weeconfig.c:832
-#, fuzzy
msgid "does not wait for ACK when sending file"
-msgstr "Leerzeichen in Unterstriche umwandeln beim Veschicken von Dateien"
+msgstr "warte beim Veschicken von Dateien nicht auf das ACK-Signal"
#: src/common/weeconfig.c:835
msgid "allowed ports for outgoing dcc"
@@ -5783,18 +5599,146 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Konfiguration wird gespeichert\n"
-#~ msgid "Kb"
-#~ msgstr "KB"
+#~ msgid "sets ban on"
+#~ msgstr "verbannt"
-#~ msgid "Mb"
-#~ msgstr "MB"
+#~ msgid "removes ban on"
+#~ msgstr "entbannt"
-#~ msgid "Gb"
-#~ msgstr "GB"
+#~ msgid "sets realname ban on"
+#~ msgstr "setzt Realnamenbann für"
-#~ msgid ""
-#~ "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize"
-#~ "\" option, max is %d.\n"
-#~ msgstr ""
-#~ "%s DCC schlug aufgrund zu großer Blockgröße fehl. Bitte überprüfen Sie "
-#~ "den Wert der \"dcc_blocksize\"-Option, das Maximum beträgt %d.\n"
+#~ msgid "removes realname ban on"
+#~ msgstr "entfernt Realnamenbann von"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "setzt Bann-Ausnahme für"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "entfernt Bann-Ausnahme für"
+
+#~ msgid "sets mode +f"
+#~ msgstr "setzt Channelmodus +f (forward on uninvited)"
+
+#~ msgid "removes mode +f"
+#~ msgstr "entfernt Channelmodus +f (forward on uninvited)"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "verleiht Halboperatorstatus an"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "entfernt den Halboperatorstatus von"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "setzt das Flag \"Zutritt nur mit Einladung\""
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "entfernt das Flag \"Zutritt nur mit Einladung\""
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "setzt Ausnahme für \"Zutritt nur mit Einladung\""
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "entfernt Ausnahme für \"Zutritt nur mit Einladung\""
+
+#~ msgid "sets channel key to"
+#~ msgstr "setzt den Channelkey auf"
+
+#~ msgid "removes channel key"
+#~ msgstr "entfernt den Channelkey"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "setzt das Userlimit auf"
+
+#~ msgid "removes user limit"
+#~ msgstr "entfernt das Userlimit"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "setzt den Channel auf moderiert"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "entfernt das moderiert-Flag"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "blockiert Nachrichten von außen"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "erlaubt Nachrichten von außen"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "verleiht Operatorstatus an"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "aberkennt den Operatorstatus von"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "setzt das privat-Flag"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "entfernt das privat-Flag"
+
+#~ msgid "sets quiet on"
+#~ msgstr "setzt das quiet-Flag"
+
+#~ msgid "removes quiet on"
+#~ msgstr "entfernt das quiet-Flag"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "setzt das geheim-Flag"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "entfernt das geheim-Flag"
+
+#~ msgid "sets topic protection"
+#~ msgstr "sperrt das Topic"
+
+#~ msgid "removes topic protection"
+#~ msgstr "gibt das Topic frei"
+
+#~ msgid "gives voice to"
+#~ msgstr "vergibt Voice an"
+
+#~ msgid "removes voice from"
+#~ msgstr "entfernt Voice von"
+
+#~ msgid "sets away"
+#~ msgstr "aktiviert Abwesenheitsstatus"
+
+#~ msgid "removes away"
+#~ msgstr "deaktiviert Abwesenheitsstatus"
+
+#~ msgid "sets invisible"
+#~ msgstr "aktiviert Unsichtbarkeitsstatus"
+
+#~ msgid "removes invisible"
+#~ msgstr "deaktiviert Unsichtbarkeitsstatus"
+
+#~ msgid "sets wallops"
+#~ msgstr "aktiviert den Empfang von Wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "deaktiviert den Empfang von Wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "aktiviert die eingeschränkte Verbindung"
+
+#~ msgid "removes restricted"
+#~ msgstr "deaktiviert die eingeschränkte Verbindung"
+
+#~ msgid "sets operator"
+#~ msgstr "vergibt Operatorstatus"
+
+#~ msgid "removes operator"
+#~ msgstr "entfernt Operatorstatus"
+
+#~ msgid "sets local operator"
+#~ msgstr "vergibt lokalen Oeratorstatus"
+
+#~ msgid "removes local operator"
+#~ msgstr "entfernt lokalen Operatorstatus"
+
+#~ msgid "sets server notices"
+#~ msgstr "aktiviert Servernachrichten"
+
+#~ msgid "removes server notices"
+#~ msgstr "deaktiviert Servernachrichten"
diff --git a/po/es.po b/po/es.po
index e4bb71d0b..894e18a39 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-07-25 20:00+0200\n"
"Last-Translator: Roberto Gonzlez Cardenete \n"
"Language-Team: weechat-dev \n"
@@ -14,88 +14,88 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, 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:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s El comando \"%s\" ha fallado!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Ningn comando para ejecutar!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s el handshake gnutls ha fallado\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s direccin proxy \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s direccin \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s direccin proxy IP no encontrada\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s Direccin IP no encontrada\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s conexin proxy rechazada\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s conexin rechazada\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -104,12 +104,12 @@ msgstr ""
"%s el proxy ha fallado al establecer la conexin al servidor (comprueba el "
"nombre de usuario o la contrasea si es necesario)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, 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:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -117,57 +117,57 @@ msgstr ""
"%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
"con soporte GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s error de inicializacin de gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexin\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Desconectado del servidor!\n"
@@ -1362,7 +1362,7 @@ msgstr "inactivo"
msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no ser guardado)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "segundos"
@@ -1445,9 +1445,9 @@ msgstr "%s, compilado en %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1477,492 +1477,310 @@ msgstr "%s%s%s ha expulsado a %s%s%s del servidor"
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:685
-msgid "sets ban on"
-msgstr "poner baneo en"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "quita el baneo en"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "pone baneo de nombre real en"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "quita baneo de nombre real en"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "pone una exencin de baneo en"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "quita una exencin de baneo en"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "pone modo +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "quita modo +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "da estado de operador de medio canal a"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "quita el estado de operador de medio canal a"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "pone el canal en modo slo-por-invitacin"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "quita el indicador de canal slo-por-invitacin"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "pone una exencin de slo-por-invitacin en"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "quita una exencin de slo-por-invitacin en"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "pone clave de canal en"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "elimina la clave de canal"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "define el lmite de usuarios en"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "elimina el lmite de usuarios"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "establece la moderacin en el canal"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "elimina la moderacin en el canal"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "establece el modo slo mensajes de usuarios del canal"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "autoriza a todos los usuarios a escribir en el canal"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "dar estado de operador de canal a"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "eliminar el estado de operador de canal a"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "establece el canal como privado"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "elimina el modo privado para el canal"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "pone el modo silencio"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "quita el modo silencio"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "establece el canal como secreto"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "elimina el modo secreto para el canal"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "activa la proteccin de tema"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "elimina la proteccin de tema"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "da voz a"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "quita la voz a"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "pone ausente"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "quita ausente"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "pone invisible"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "quita invisible"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "pone wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "quita wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "pone restringido"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "quita restringido"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "pone operador"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "quita operador"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "pone operador local"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "quita operador local"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "pone notificaciones del servidor"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "quita notificaciones del servidor"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, 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:1354
+#: src/irc/irc-recv.c:702
+#, 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:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Usted es conocido ahora como %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s es conocido ahora como %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s respuesta de %s%s%s: %ld.%ld segundos\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Privado"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s comando \"%s\" recibido sin host o canal\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s ha abandonado %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Canal"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Recibido un CTCP %sSOUND%s \"%s\" de %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s recibido de %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "CTCP desconocido %s%s%s recibido de %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s recibido de %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, 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:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est ausente: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactividad: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "das"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "da"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Sin tema establecido para %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "El tema para %s%s%s es: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Tema establecido por %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Usuarios %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, 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:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1971,14 +1789,14 @@ msgstr ""
"%s: todos los nombres de usuario declarados ya estn en uso, cerrando la "
"conexin con el servidor!\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "desconocido"
@@ -2417,27 +2235,27 @@ msgstr ""
msgid "ETA"
msgstr "Tiempo estimado de llegada"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Aceptar"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Cancelar"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Eliminar"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Cerrar vista de datos basura"
@@ -2459,28 +2277,28 @@ msgstr ""
msgid "(away)"
msgstr "(ausente)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[no conectado] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "RAW_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-MS-"
@@ -2488,7 +2306,7 @@ msgstr "-M
msgid "server"
msgstr "servidor"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "No hay suficiente memoria para una nueva lnea\n"
@@ -5817,6 +5635,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Guardar configuracin a disco\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "pone ausente"
+
+#~ msgid "removes away"
+#~ msgstr "quita ausente"
+
+#~ msgid "sets invisible"
+#~ msgstr "pone invisible"
+
+#~ msgid "removes invisible"
+#~ msgstr "quita invisible"
+
+#~ msgid "sets wallops"
+#~ msgstr "pone wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "quita wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "pone restringido"
+
+#~ msgid "removes restricted"
+#~ msgstr "quita restringido"
+
+#~ msgid "sets operator"
+#~ msgstr "pone operador"
+
+#~ msgid "removes operator"
+#~ msgstr "quita operador"
+
+#~ msgid "sets local operator"
+#~ msgstr "pone operador local"
+
+#~ msgid "removes local operator"
+#~ msgstr "quita operador local"
+
+#~ msgid "sets server notices"
+#~ msgstr "pone notificaciones del servidor"
+
+#~ msgid "removes server notices"
+#~ msgstr "quita notificaciones del servidor"
+
+#~ msgid "sets ban on"
+#~ msgstr "poner baneo en"
+
+#~ msgid "removes ban on"
+#~ msgstr "quita el baneo en"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "pone baneo de nombre real en"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "quita baneo de nombre real en"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "pone una exencin de baneo en"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "quita una exencin de baneo en"
+
+#~ msgid "sets mode +f"
+#~ msgstr "pone modo +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "quita modo +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "da estado de operador de medio canal a"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "quita el estado de operador de medio canal a"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "pone el canal en modo slo-por-invitacin"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "quita el indicador de canal slo-por-invitacin"
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "pone una exencin de slo-por-invitacin en"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "quita una exencin de slo-por-invitacin en"
+
+#~ msgid "sets channel key to"
+#~ msgstr "pone clave de canal en"
+
+#~ msgid "removes channel key"
+#~ msgstr "elimina la clave de canal"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "define el lmite de usuarios en"
+
+#~ msgid "removes user limit"
+#~ msgstr "elimina el lmite de usuarios"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "establece la moderacin en el canal"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "elimina la moderacin en el canal"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "establece el modo slo mensajes de usuarios del canal"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "autoriza a todos los usuarios a escribir en el canal"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "dar estado de operador de canal a"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "eliminar el estado de operador de canal a"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "establece el canal como privado"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "elimina el modo privado para el canal"
+
+#~ msgid "sets quiet on"
+#~ msgstr "pone el modo silencio"
+
+#~ msgid "removes quiet on"
+#~ msgstr "quita el modo silencio"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "establece el canal como secreto"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "elimina el modo secreto para el canal"
+
+#~ msgid "sets topic protection"
+#~ msgstr "activa la proteccin de tema"
+
+#~ msgid "removes topic protection"
+#~ msgstr "elimina la proteccin de tema"
+
+#~ msgid "gives voice to"
+#~ msgstr "da voz a"
+
+#~ msgid "removes voice from"
+#~ msgstr "quita la voz a"
+
#~ msgid "Kb"
#~ msgstr "KB"
diff --git a/po/fr.po b/po/fr.po
index 2587b35bb..740a32c88 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,96 +6,96 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
-"PO-Revision-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
+"PO-Revision-Date: 2006-08-07 00:24+0200\n"
"Last-Translator: FlashCode \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Impossible de dterminer le nom d'utilisateur"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s impossible d'allouer un nouveau serveur\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s erreur d'envoi de donnes au serveur IRC\n"
-#: src/irc/irc-server.c:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s mmoire insuffisante pour un message IRC reu\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s La commande \"%s\" a chou !\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Pas de commande excuter !\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s impossible de lire des donnes sur la socket, dconnexion du serveur...\n"
-#: src/irc/irc-server.c:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s le handshake gnutls a chou\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresse du proxy \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresse \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s adresse IP du proxy introuvable\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s adresse IP introuvable\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s connexion au proxy refuse\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s connexion refuse\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -104,12 +104,12 @@ msgstr ""
"%s le proxy n'a pas pu se connecter au serveur (vrifiez l'utilisateur/mot "
"de passe si utiliss)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s impossible de paramtrer le nom/IP local\n"
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -117,57 +117,57 @@ msgstr ""
"%s impossible de se connecter en SSL car WeeChat n'a pas t construit avec "
"le support GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de crer le pipe\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de crer la socket\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramtrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1662
+#: src/irc/irc-server.c:1660
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramtrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Dconnect du serveur !\n"
@@ -1356,7 +1356,7 @@ msgstr "d
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauv)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "secondes"
@@ -1441,9 +1441,9 @@ msgstr "%s, compil
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouv pour la commande \"%s\"\n"
@@ -1473,492 +1473,310 @@ msgstr "%s%s%s a tu
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:685
-msgid "sets ban on"
-msgstr "instaure un bannissement sur"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "supprime le banissement sur"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "instaure un bannissement sur le nom rel"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "supprime le banissement sur le nom rel"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "dfinit une exception de banissement sur"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "supprime l'exception de banissement sur"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "dfinit le mode +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "supprime le mode +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "donne le droit demi-oprateur "
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "supprime le droit demi-oprateur "
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "dfinit le canal en mode invit seulement"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "supprime le mode invit seulement pour le canal"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "dfinit une exception d'invitation sur"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "supprime l'exception d'invitation sur"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "dfinit la cl du canal "
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "supprime la cl du canal"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "dfinit la limite d'utilisateurs "
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "supprime la limite d'utilisateurs"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "instaure la modration sur le canal"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "supprime la modration sur le canal"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "interdit aux utilisateurs en dehors du canal d'y crire"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "autorise tout utilisateur crire sur le canal"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "donne le droit oprateur "
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "supprime le droit oprateur "
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "dfinit le canal comme priv"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "supprime le mode priv pour le canal"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "dfinit le mode muet sur"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "supprime le mode muet sur"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "dfinit le canal comme secret"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "supprime le mode secret pour le canal"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "active la protection du titre"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "supprime la protection du titre"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "donne la voix "
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "supprime la voix de"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "active l'absence"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "supprime l'absence"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "active l'invisibilit"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "supprime l'invisibilit"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "active wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "supprime wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "active la restriction"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "supprime la restriction"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "active l'oprateur"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "supprime l'oprateur"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "active l'oprateur local"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "supprime l'oprateur local"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "active les notices du serveur"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "supprime les notices du serveur"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reue sans host\n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s commande \"%s\" reue sans canal ou utilisateur\n"
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, 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:731
+#, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Mode utilisateur %s%s %s[%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Vous tes maintenant connu sous le nom %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s est maintenant connu sous le nom %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s utilisateur non trouv pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s rponse de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s rponse de %s%s%s: %ld.%ld secondes\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de crer la fentre prive \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Priv"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s commande \"%s\" reue sans host ou canal\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s a quitt %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Canal"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "CTCP %sSOUND%s \"%s\" reu de %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s reu de %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "CTCP inconnu %s%s%s reu de %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s reu de %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s type de DCC CHAT inconnu reu de "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reue sans canal\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
+#: src/irc/irc-recv.c:2408
#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
-msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n"
+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:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est absent: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactivit: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Pas de titre dfini pour %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Le titre pour %s%s%s est: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s impossible de dterminer le canal pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Titre dfini par %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
"%s impossible de dterminer le nom d'utilisateur pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Utilisateurs %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s impossible de crer l'utilisateur \"%s\" pour le canal \"%s\"\n"
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 2me "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:5303
+#: src/irc/irc-recv.c:4767
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 3me "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1967,14 +1785,14 @@ msgstr ""
"%s: tous les noms d'utilisateurs dclars sont dj en cours d'utilisation, "
"fermeture de la connexion avec le serveur !\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 1er "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "inconnu"
@@ -2413,27 +2231,27 @@ msgstr "Go"
msgid "ETA"
msgstr "ETA"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Accepter"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Annuler"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Retirer"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Fermer la vue IRC brut"
@@ -2455,28 +2273,28 @@ msgstr ""
msgid "(away)"
msgstr "(absent)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[non connect] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "IRC_BRUT"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-PLUS-"
@@ -2484,7 +2302,7 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Pas assez de mmoire pour une nouvelle ligne !\n"
@@ -5811,6 +5629,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "active l'absence"
+
+#~ msgid "removes away"
+#~ msgstr "supprime l'absence"
+
+#~ msgid "sets invisible"
+#~ msgstr "active l'invisibilit"
+
+#~ msgid "removes invisible"
+#~ msgstr "supprime l'invisibilit"
+
+#~ msgid "sets wallops"
+#~ msgstr "active wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "supprime wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "active la restriction"
+
+#~ msgid "removes restricted"
+#~ msgstr "supprime la restriction"
+
+#~ msgid "sets operator"
+#~ msgstr "active l'oprateur"
+
+#~ msgid "removes operator"
+#~ msgstr "supprime l'oprateur"
+
+#~ msgid "sets local operator"
+#~ msgstr "active l'oprateur local"
+
+#~ msgid "removes local operator"
+#~ msgstr "supprime l'oprateur local"
+
+#~ msgid "sets server notices"
+#~ msgstr "active les notices du serveur"
+
+#~ msgid "removes server notices"
+#~ msgstr "supprime les notices du serveur"
+
+#~ msgid "sets ban on"
+#~ msgstr "instaure un bannissement sur"
+
+#~ msgid "removes ban on"
+#~ msgstr "supprime le banissement sur"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "instaure un bannissement sur le nom rel"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "supprime le banissement sur le nom rel"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "dfinit une exception de banissement sur"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "supprime l'exception de banissement sur"
+
+#~ msgid "sets mode +f"
+#~ msgstr "dfinit le mode +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "supprime le mode +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "donne le droit demi-oprateur "
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "supprime le droit demi-oprateur "
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "dfinit le canal en mode invit seulement"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "supprime le mode invit seulement pour le canal"
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "dfinit une exception d'invitation sur"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "supprime l'exception d'invitation sur"
+
+#~ msgid "sets channel key to"
+#~ msgstr "dfinit la cl du canal "
+
+#~ msgid "removes channel key"
+#~ msgstr "supprime la cl du canal"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "dfinit la limite d'utilisateurs "
+
+#~ msgid "removes user limit"
+#~ msgstr "supprime la limite d'utilisateurs"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "instaure la modration sur le canal"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "supprime la modration sur le canal"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "interdit aux utilisateurs en dehors du canal d'y crire"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "autorise tout utilisateur crire sur le canal"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "donne le droit oprateur "
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "supprime le droit oprateur "
+
+#~ msgid "sets private channel flag"
+#~ msgstr "dfinit le canal comme priv"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "supprime le mode priv pour le canal"
+
+#~ msgid "sets quiet on"
+#~ msgstr "dfinit le mode muet sur"
+
+#~ msgid "removes quiet on"
+#~ msgstr "supprime le mode muet sur"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "dfinit le canal comme secret"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "supprime le mode secret pour le canal"
+
+#~ msgid "sets topic protection"
+#~ msgstr "active la protection du titre"
+
+#~ msgid "removes topic protection"
+#~ msgstr "supprime la protection du titre"
+
+#~ msgid "gives voice to"
+#~ msgstr "donne la voix "
+
+#~ msgid "removes voice from"
+#~ msgstr "supprime la voix de"
+
#~ msgid "Kb"
#~ msgstr "Ko"
diff --git a/po/hu.po b/po/hu.po
index 84d5ce13a..0f09e65ef 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-07-25 20:00+0200\n"
"Last-Translator: Andras Voroskoi \n"
"Language-Team: weechat-dev \n"
@@ -16,89 +16,89 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: KBabel 1.11.1\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "A felhasználónév meghatározása sikertelen"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s az új szerver lefoglalása sikertelen\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Parancs \"%s\" sikertelen!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s A futtatandó parancs nem található!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls kézfogás sikertelen\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, 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:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s cím \"%s\" nem található\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, 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:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-cím nem található\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, 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:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s a csatlakozás elutasítva\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -107,12 +107,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:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr ""
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -120,61 +120,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:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls inicializációs hiba\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, 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:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nem sikerült a csatornát létrehozni\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Újracsatlakozás a szerverhez...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Lekapcsolódott a szerverről!\n"
@@ -1366,7 +1366,7 @@ msgstr "ki"
msgid " (temporary server, will not be saved)"
msgstr " (átmeneti szerver, nem lesz mentve)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "másodperc"
@@ -1447,9 +1447,9 @@ msgstr "%s, lefordítva: %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n"
@@ -1479,510 +1479,317 @@ msgstr ""
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:685
-msgid "sets ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "bekapcsolja az +f módot"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "kikapcsolja az +f módot"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "féloperátori jogot ad a következő felhasználónak:"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "elveszi a féloperátori jogot a következő felhasználótól:"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "bekapcsolja a meghívásos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "kikapcsolja a meghívásos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "a szoba kulcsát a következőre változtatta:"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "megszünteti a szoba kulcsát"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "kérésére a felhasználói limit:"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "megszünteti a felhasználói limitet"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "bekapcsolja a moderált szoba kapcsolót"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "kikapcsolja a moderált szoba kapcsolót"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "bekapcsolja az üzenet csak ebből a szobából kapcsolót"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "kikapcsolja az üzenet csak ebből a szobából kapcsolót"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "operátori jogot ad a következőnek:"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "elveszi az operátori jogot a következőktől:"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "bekapcsolja a privát szoba kapcsolót"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "kikapcsolja a privát szoba kapcsolót"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "bekapcsolja a csendes módot"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "kikapcsolja a csendes módot"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "bekapcsolja a titkos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "kikapcsolja a titkos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "bekapcsolja a témavédelmet"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "kikapcsolja a témavédelmet"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "voice jogot biztosít a következőnek:"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "elveszi a voice jogot a következőtől:"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr ""
-
-#: src/irc/irc-recv.c:1139
-#, fuzzy
-msgid "removes away"
-msgstr "alias eltávolítása"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr ""
-
-#: src/irc/irc-recv.c:1150
-#, fuzzy
-msgid "removes invisible"
-msgstr "elveszi a voice jogot a következőtől:"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr ""
-
-#: src/irc/irc-recv.c:1161
-#, fuzzy
-msgid "removes wallops"
-msgstr "alias eltávolítása"
-
-#: src/irc/irc-recv.c:1171
-#, fuzzy
-msgid "sets restricted"
-msgstr "csatlakozás megtagadva!"
-
-#: src/irc/irc-recv.c:1172
-#, fuzzy
-msgid "removes restricted"
-msgstr "megszünteti a felhasználói limitet"
-
-#: src/irc/irc-recv.c:1182
-#, fuzzy
-msgid "sets operator"
-msgstr "whois (operátor)"
-
-#: src/irc/irc-recv.c:1183
-#, fuzzy
-msgid "removes operator"
-msgstr "elveszi a voice jogot a következőtől:"
-
-#: src/irc/irc-recv.c:1193
-#, fuzzy
-msgid "sets local operator"
-msgstr "ehhez szoba operátornak kell lennie"
-
-#: src/irc/irc-recv.c:1194
-#, fuzzy
-msgid "removes local operator"
-msgstr "elveszi az operátori jogot a következőktől:"
-
-#: src/irc/irc-recv.c:1204
-#, fuzzy
-msgid "sets server notices"
-msgstr "cél: szerver neve"
-
-#: src/irc/irc-recv.c:1205
-#, fuzzy
-msgid "removes server notices"
-msgstr "elveszi a voice jogot a felhasználó(k)tól"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, fuzzy, c-format
+msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
+msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Az új neved: %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s új neve: %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s nem található név a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr ""
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Privát"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s elhagyta a(z) %s%s szobát"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Szoba"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, c-format
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s távol: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Online felhasználók: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s tétlen: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "nap"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "nap"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "óra"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "óra"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "perc"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "perc"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "másodperc"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, 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:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "A %s%s%s szoba témája: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, 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:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Felhasználók a %s%s%s szobában: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "név"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "név"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "operátor"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "operátor"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normál"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, 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:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "ismeretlen"
@@ -2394,27 +2201,27 @@ msgstr ""
msgid "ETA"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Elfogadás"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Mégsem"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Eltávolítás"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Régi DCC törlése"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] DCC nézet bezárása"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Nyers adat nézet bezárása"
@@ -2436,28 +2243,28 @@ msgstr ""
msgid "(away)"
msgstr "(távol)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[nincs csatlakozva]"
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Akt: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-TOVÁBB-"
@@ -2465,7 +2272,7 @@ msgstr "-TOVÁBB-"
msgid "server"
msgstr "szerver"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Nincs elég memória az új sorhoz\n"
@@ -5696,6 +5503,131 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Beállítások mentése a lemezre\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
+
+#, fuzzy
+#~ msgid "removes away"
+#~ msgstr "alias eltávolítása"
+
+#, fuzzy
+#~ msgid "removes invisible"
+#~ msgstr "elveszi a voice jogot a következőtől:"
+
+#, fuzzy
+#~ msgid "removes wallops"
+#~ msgstr "alias eltávolítása"
+
+#, fuzzy
+#~ msgid "sets restricted"
+#~ msgstr "csatlakozás megtagadva!"
+
+#, fuzzy
+#~ msgid "removes restricted"
+#~ msgstr "megszünteti a felhasználói limitet"
+
+#, fuzzy
+#~ msgid "sets operator"
+#~ msgstr "whois (operátor)"
+
+#, fuzzy
+#~ msgid "removes operator"
+#~ msgstr "elveszi a voice jogot a következőtől:"
+
+#, fuzzy
+#~ msgid "sets local operator"
+#~ msgstr "ehhez szoba operátornak kell lennie"
+
+#, fuzzy
+#~ msgid "removes local operator"
+#~ msgstr "elveszi az operátori jogot a következőktől:"
+
+#, fuzzy
+#~ msgid "sets server notices"
+#~ msgstr "cél: szerver neve"
+
+#, fuzzy
+#~ msgid "removes server notices"
+#~ msgstr "elveszi a voice jogot a felhasználó(k)tól"
+
+#~ msgid "sets mode +f"
+#~ msgstr "bekapcsolja az +f módot"
+
+#~ msgid "removes mode +f"
+#~ msgstr "kikapcsolja az +f módot"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "féloperátori jogot ad a következő felhasználónak:"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "elveszi a féloperátori jogot a következő felhasználótól:"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "bekapcsolja a meghívásos szoba kapcsolót"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "kikapcsolja a meghívásos szoba kapcsolót"
+
+#~ msgid "sets channel key to"
+#~ msgstr "a szoba kulcsát a következőre változtatta:"
+
+#~ msgid "removes channel key"
+#~ msgstr "megszünteti a szoba kulcsát"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "kérésére a felhasználói limit:"
+
+#~ msgid "removes user limit"
+#~ msgstr "megszünteti a felhasználói limitet"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "bekapcsolja a moderált szoba kapcsolót"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "kikapcsolja a moderált szoba kapcsolót"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "bekapcsolja az üzenet csak ebből a szobából kapcsolót"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "kikapcsolja az üzenet csak ebből a szobából kapcsolót"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "operátori jogot ad a következőnek:"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "elveszi az operátori jogot a következőktől:"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "bekapcsolja a privát szoba kapcsolót"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "kikapcsolja a privát szoba kapcsolót"
+
+#~ msgid "sets quiet on"
+#~ msgstr "bekapcsolja a csendes módot"
+
+#~ msgid "removes quiet on"
+#~ msgstr "kikapcsolja a csendes módot"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "bekapcsolja a titkos szoba kapcsolót"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "kikapcsolja a titkos szoba kapcsolót"
+
+#~ msgid "sets topic protection"
+#~ msgstr "bekapcsolja a témavédelmet"
+
+#~ msgid "removes topic protection"
+#~ msgstr "kikapcsolja a témavédelmet"
+
+#~ msgid "gives voice to"
+#~ msgstr "voice jogot biztosít a következőnek:"
+
+#~ msgid "removes voice from"
+#~ msgstr "elveszi a voice jogot a következőtől:"
+
#~ msgid "Kb"
#~ msgstr "Kb"
diff --git a/po/ru.po b/po/ru.po
index 34ade2d22..9927c7731 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-08-06 00:13+0300\n"
"Last-Translator: Stalwart \n"
"Language-Team: weechat-dev \n"
@@ -15,88 +15,88 @@ 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:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Не могу получить имя пользователя"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s не могу расположить новый сервер\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s ошибка при отправке данных IRC серверу\n"
-#: src/irc/irc-server.c:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s недостаточно памяти для полученного сообщения\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Команда \"%s\" не удалась!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Нет команд для запуска!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
"%s Неизвестная команда: команда=\"%s\", хост=\"%s\", аргументы=\"%s\"\n"
-#: src/irc/irc-server.c:869
+#: src/irc/irc-server.c:867
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s невозможно прочитать данные из сокета, отключаюсь от сервера...\n"
-#: src/irc/irc-server.c:950
+#: src/irc/irc-server.c:948
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Повторное подключение к серверу через %d секунд\n"
-#: src/irc/irc-server.c:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s приветствие gnutls не удалось\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s proxy \"%s\" не найден\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s адрес \"%s\" не найден\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP адрес proxy-сервера не найден\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP адрес не найден\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s в подключении к proxy-серверу отказано\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s в подключении отказано\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -105,12 +105,12 @@ msgstr ""
"%s proxy-сервер не смог установить соединение с сервером (проверьте имя "
"пользователя и пароль если они используются)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s не могу установить локальный хост/IP\n"
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
"%s невозможно соединиться с использованием SSL, так как WeeChat собран без "
"поддержки GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1592
+#: src/irc/irc-server.c:1590
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Подключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s ошибка инициализации gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s не могу создать pipe\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s невозможно создать сокет\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1662
+#: src/irc/irc-server.c:1660
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Повторное соединение...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Отключен от сервера!\n"
@@ -1349,7 +1349,7 @@ msgstr "выкл."
msgid " (temporary server, will not be saved)"
msgstr " (временный сервер, не будет сохранён)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "секунды"
@@ -1431,9 +1431,9 @@ msgstr "%s, собран %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s канал \"%s\" не найден для команды \"%s\"\n"
@@ -1463,499 +1463,317 @@ msgstr "%s%s%s убил %s%s%s"
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s хост \"%s\" не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:685
-msgid "sets ban on"
-msgstr "установил бан на"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "снял бан с"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "устанавливает бан по реальному имени на"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "снимает бан по реальному имени с"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "устанавливает исключение бана на"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "снимает бан с"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "установил режим +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "снял режим +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "дал привилегии полу-оператора канала"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "снял привилегии полу-оператора канала с"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "установил флаг канала \"только по приглашению\""
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "снял флаг канала \"только по приглашению\""
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "устанавливает режим \"только по приглашению\" на"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "снимает режим \"только по приглашению\" с"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "установил ключ канала: "
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "убрал ключ канала"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "установил лимит пользователей в"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "снял лимит пользователей"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "установил флаг канала \"модерируемый\""
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "снял флаг канал \"модерируемый\""
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "установил флаг канала \"только сообщения с канала\""
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "снял флаг канала \"только сообщения с канала\""
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "дал привилегии оператора канала"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "снял привилегии оператора канала с"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "установил флаг канала \"личный\""
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "снял флаг канала \"личный\""
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "приглушил"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "снял приглушение"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "установил флаг канала \"тайный\""
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "снял флаг канала \"тайный\""
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "установил защиту темы канала"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "снял защиту темы канала"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "дал право голоса"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "убрал право голоса у"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "устанавливает отсутствие"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "снимает отсутствие"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "устанавливает невидимость"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "снимает невидимость"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "устанавливает wallopы"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "снимает wallopы"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "устанавливает флаг \"ограниченный\""
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "снимает флаг \"ограниченный\""
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "устанавливает оператор"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "снимает оператор"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "устанавливает локальный оператор"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "снимает локальный оператор"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "устанавливает уведомления сервера"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "снимает уведомления сервера"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" команда получена без хоста\n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" команда получена без канала или ника\n"
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, 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 был %s\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Режим пользователя %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Теперь вы известны как %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s теперь известен как %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s ник не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "Ответ на CTCP %sVERSION%s от %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "Ответ на %sPING%s от %s%s%s: %ld.%ld секунд\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s не могу создать новое окно привата \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Приват"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s \"%s\" команда получена без хоста или канала\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s покинул %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Канал"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Получен CTCP %sSOUND%s \"%s\" от %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "Получен CTCP %sPING%s от %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "Получен CTCP %sVERSION%s от %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s не могу проанализировать команду \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s неизвестный режим DCC CHAT получен от "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" команда получена без канала\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, 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:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s отсутствует: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Пользователей в сети:"
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s бездействует: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "дней"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "день"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "часов"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "час"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "минут"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "минута"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "секунда"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Не установлена тема канала для %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Тема канала %s%s%s: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s не могу опознать канал для команды \"%s\"\n"
-#: src/irc/irc-recv.c:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Тема установлена пользователем %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s не могу опознать дату/время для команды \"%s\"\n"
-#: src/irc/irc-recv.c:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s не могу опознать ник для команды \"%s\"\n"
-#: src/irc/irc-recv.c:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Реоп канала %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Ники %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s не могу создать ник \"%s\" для канала \"%s\"\n"
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "ники"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "ник"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "опы"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "оп"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "полуопы"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "полуоп"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "войсы"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "войс"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "обычные"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr "%s: все предложеные ники заняты, отключаюсь от сервера!\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "неизвестный"
@@ -2378,27 +2196,27 @@ msgstr "ГБ"
msgid "ETA"
msgstr "осталось"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Принять"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Отменить"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Удалить"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Очистить список"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Закрыть окно"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Закрыть окно сырых данных"
@@ -2420,28 +2238,28 @@ msgstr "<серверы>"
msgid "(away)"
msgstr "(отсутствует)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[не соединён] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Активны: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "RAW_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Задержка: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-ДАЛЬШЕ-"
@@ -2449,7 +2267,7 @@ msgstr "-ДАЛЬШЕ-"
msgid "server"
msgstr "сервер"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Недостаточно памяти для новой строчки\n"
@@ -5728,6 +5546,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Сохраняю конфигурацию\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Режим пользователя %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "устанавливает отсутствие"
+
+#~ msgid "removes away"
+#~ msgstr "снимает отсутствие"
+
+#~ msgid "sets invisible"
+#~ msgstr "устанавливает невидимость"
+
+#~ msgid "removes invisible"
+#~ msgstr "снимает невидимость"
+
+#~ msgid "sets wallops"
+#~ msgstr "устанавливает wallopы"
+
+#~ msgid "removes wallops"
+#~ msgstr "снимает wallopы"
+
+#~ msgid "sets restricted"
+#~ msgstr "устанавливает флаг \"ограниченный\""
+
+#~ msgid "removes restricted"
+#~ msgstr "снимает флаг \"ограниченный\""
+
+#~ msgid "sets operator"
+#~ msgstr "устанавливает оператор"
+
+#~ msgid "removes operator"
+#~ msgstr "снимает оператор"
+
+#~ msgid "sets local operator"
+#~ msgstr "устанавливает локальный оператор"
+
+#~ msgid "removes local operator"
+#~ msgstr "снимает локальный оператор"
+
+#~ msgid "sets server notices"
+#~ msgstr "устанавливает уведомления сервера"
+
+#~ msgid "removes server notices"
+#~ msgstr "снимает уведомления сервера"
+
+#~ msgid "sets ban on"
+#~ msgstr "установил бан на"
+
+#~ msgid "removes ban on"
+#~ msgstr "снял бан с"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "устанавливает бан по реальному имени на"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "снимает бан по реальному имени с"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "устанавливает исключение бана на"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "снимает бан с"
+
+#~ msgid "sets mode +f"
+#~ msgstr "установил режим +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "снял режим +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "дал привилегии полу-оператора канала"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "снял привилегии полу-оператора канала с"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "установил флаг канала \"только по приглашению\""
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "снял флаг канала \"только по приглашению\""
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "устанавливает режим \"только по приглашению\" на"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "снимает режим \"только по приглашению\" с"
+
+#~ msgid "sets channel key to"
+#~ msgstr "установил ключ канала: "
+
+#~ msgid "removes channel key"
+#~ msgstr "убрал ключ канала"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "установил лимит пользователей в"
+
+#~ msgid "removes user limit"
+#~ msgstr "снял лимит пользователей"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "установил флаг канала \"модерируемый\""
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "снял флаг канал \"модерируемый\""
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "установил флаг канала \"только сообщения с канала\""
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "снял флаг канала \"только сообщения с канала\""
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "дал привилегии оператора канала"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "снял привилегии оператора канала с"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "установил флаг канала \"личный\""
+
+#~ msgid "removes private channel flag"
+#~ msgstr "снял флаг канала \"личный\""
+
+#~ msgid "sets quiet on"
+#~ msgstr "приглушил"
+
+#~ msgid "removes quiet on"
+#~ msgstr "снял приглушение"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "установил флаг канала \"тайный\""
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "снял флаг канала \"тайный\""
+
+#~ msgid "sets topic protection"
+#~ msgstr "установил защиту темы канала"
+
+#~ msgid "removes topic protection"
+#~ msgstr "снял защиту темы канала"
+
+#~ msgid "gives voice to"
+#~ msgstr "дал право голоса"
+
+#~ msgid "removes voice from"
+#~ msgstr "убрал право голоса у"
+
#~ msgid "Kb"
#~ msgstr "Kb"
diff --git a/po/weechat.pot b/po/weechat.pot
index 669dbba9a..c8697269c 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -15,155 +15,155 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr ""
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr ""
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr ""
-#: src/irc/irc-server.c:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr ""
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr ""
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr ""
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
-#: src/irc/irc-server.c:869
+#: src/irc/irc-server.c:867
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
-#: src/irc/irc-server.c:950
+#: src/irc/irc-server.c:948
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr ""
-#: src/irc/irc-server.c:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
"used)\n"
msgstr ""
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr ""
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1578
+#: src/irc/irc-server.c:1576
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1588
+#: src/irc/irc-server.c:1586
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1592
+#: src/irc/irc-server.c:1590
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:1662
+#: src/irc/irc-server.c:1660
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
msgid " (temporary server, will not be saved)"
msgstr ""
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr ""
@@ -1327,9 +1327,9 @@ msgstr ""
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
@@ -1359,498 +1359,316 @@ msgstr ""
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:685
-msgid "sets ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr ""
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr ""
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr ""
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr ""
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr ""
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr ""
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr ""
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr ""
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr ""
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr ""
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr ""
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr ""
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr ""
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr ""
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr ""
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr ""
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr ""
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr ""
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr ""
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr ""
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr ""
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr ""
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr ""
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr ""
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr ""
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr ""
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, c-format
+msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:731
+#, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr ""
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr ""
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr ""
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr ""
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr ""
-#: src/irc/irc-recv.c:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr ""
-#: src/irc/irc-recv.c:2829
+#: src/irc/irc-recv.c:2276
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:2960
+#: src/irc/irc-recv.c:2408
#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr ""
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr ""
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr ""
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr ""
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:4288
+#: src/irc/irc-recv.c:3752
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4348
+#: src/irc/irc-recv.c:3812
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr ""
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr ""
-#: src/irc/irc-recv.c:5156
+#: src/irc/irc-recv.c:4620
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr ""
-#: src/irc/irc-recv.c:5291
+#: src/irc/irc-recv.c:4755
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:5303
+#: src/irc/irc-recv.c:4767
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr ""
@@ -2249,27 +2067,27 @@ msgstr ""
msgid "ETA"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr ""
@@ -2291,28 +2109,28 @@ msgstr ""
msgid "(away)"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr ""
@@ -2320,7 +2138,7 @@ msgstr ""
msgid "server"
msgstr ""
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr ""
diff --git a/src/common/completion.c b/src/common/completion.c
index f61c9976c..868fade18 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -348,6 +348,19 @@ completion_list_add_key_cmd (t_completion *completion)
}
}
+/*
+ * completion_list_add_self_nick: add self nick on server to completion list
+ */
+
+void
+completion_list_add_self_nick (t_completion *completion)
+{
+ if (completion->server)
+ {
+ completion_list_add (completion, ((t_irc_server *)(completion->server))->nick);
+ }
+}
+
/*
* completion_list_add_channel_nicks: add channel nicks to completion list
*/
@@ -755,6 +768,9 @@ completion_build_list_template (t_completion *completion, char *template)
case 'k': /* key cmd/funtcions*/
completion_list_add_key_cmd (completion);
break;
+ case 'm': /* self nickname */
+ completion_list_add_self_nick (completion);
+ break;
case 'n': /* channel nicks */
completion_list_add_channel_nicks (completion);
break;
diff --git a/src/gui/curses/gui-curses-input.c b/src/gui/curses/gui-curses-input.c
index 72b7c816d..d173f6416 100644
--- a/src/gui/curses/gui-curses-input.c
+++ b/src/gui/curses/gui-curses-input.c
@@ -25,6 +25,7 @@
#endif
#include
+#include
#include "../../common/weechat.h"
#include "../gui.h"
@@ -73,8 +74,8 @@ gui_input_set_color (t_gui_window *window, int irc_color)
int
gui_input_get_prompt_length (t_gui_window *window, char *nick)
{
- char *pos, saved_char, *modes;
- int char_size, length, mode_found;
+ char *pos, saved_char;
+ int char_size, length;
length = 0;
pos = cfg_look_input_format;
@@ -99,18 +100,9 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
case 'm':
if (SERVER(window->buffer))
{
- mode_found = 0;
- for (modes = SERVER(window->buffer)->nick_modes;
- modes && modes[0]; modes++)
- {
- if (modes[0] != ' ')
- {
- length++;
- mode_found = 1;
- }
- }
- if (mode_found)
- length++;
+ if (SERVER(window->buffer)->nick_modes
+ && SERVER(window->buffer)->nick_modes[0])
+ length += strlen (SERVER(window->buffer)->nick_modes);
}
pos++;
break;
@@ -155,8 +147,8 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
void
gui_input_draw_prompt (t_gui_window *window, char *nick)
{
- char *pos, saved_char, *modes;
- int char_size, mode_found;
+ char *pos, saved_char;
+ int char_size;
wmove (GUI_CURSES(window)->win_input, 0, 0);
pos = cfg_look_input_format;
@@ -191,25 +183,13 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
case 'm':
if (SERVER(window->buffer))
{
- mode_found = 0;
- for (modes = SERVER(window->buffer)->nick_modes;
- modes && modes[0]; modes++)
- {
- if (modes[0] != ' ')
- mode_found = 1;
- }
- if (mode_found)
+ if (SERVER(window->buffer)->nick_modes
+ && SERVER(window->buffer)->nick_modes[0])
{
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT);
- wprintw (GUI_CURSES(window)->win_input, "+");
- for (modes = SERVER(window->buffer)->nick_modes;
- modes && modes[0]; modes++)
- {
- if (modes[0] != ' ')
- wprintw (GUI_CURSES(window)->win_input, "%c",
- modes[0]);
- }
+ wprintw (GUI_CURSES(window)->win_input, "%s",
+ SERVER(window->buffer)->nick_modes);
}
}
pos++;
diff --git a/src/gui/curses/gui-curses-status.c b/src/gui/curses/gui-curses-status.c
index 3d7317c9a..ad77dfcd9 100644
--- a/src/gui/curses/gui-curses-status.c
+++ b/src/gui/curses/gui-curses-status.c
@@ -44,7 +44,7 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
t_gui_window *ptr_win;
t_weechat_hotlist *ptr_hotlist;
char format[32], str_nicks[32], *more;
- int i, first_mode, x, server_pos, server_total;
+ int x, server_pos, server_total;
int display_name, names_count;
/* make gcc happy */
@@ -171,28 +171,10 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
wprintw (GUI_CURSES(ptr_win)->win_status, "(");
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
COLOR_WIN_STATUS);
- i = 0;
- first_mode = 1;
- while (CHANNEL(ptr_win->buffer)->modes[i])
- {
- if (CHANNEL(ptr_win->buffer)->modes[i] != ' ')
- {
- if (first_mode)
- {
- wprintw (GUI_CURSES(ptr_win)->win_status, "+");
- first_mode = 0;
- }
- wprintw (GUI_CURSES(ptr_win)->win_status, "%c",
- CHANNEL(ptr_win->buffer)->modes[i]);
- }
- i++;
- }
- if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_KEY] != ' ')
- wprintw (GUI_CURSES(ptr_win)->win_status, ",%s",
- CHANNEL(ptr_win->buffer)->key);
- if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_LIMIT] != ' ')
- wprintw (GUI_CURSES(ptr_win)->win_status, ",%d",
- CHANNEL(ptr_win->buffer)->limit);
+ if (CHANNEL(ptr_win->buffer)->modes
+ && (strcmp (CHANNEL(ptr_win->buffer)->modes, "+") != 0))
+ wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+ CHANNEL(ptr_win->buffer)->modes);
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
COLOR_WIN_STATUS_DELIMITERS);
wprintw (GUI_CURSES(ptr_win)->win_status, ")");
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index d946cdb43..e53379a04 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -99,6 +99,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
gui_buffers->all_servers = 1;
if (cfg_log_auto_server)
gui_log_start (gui_buffers);
+ gui_buffers->completion.server = server;
return gui_buffers;
}
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index 8853e80fb..7e7504ae0 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -26,6 +26,7 @@ lib_weechat_irc_a_SOURCES = irc.h \
irc-server.c \
irc-channel.c \
irc-nick.c \
+ irc-mode.c \
irc-dcc.c \
irc-ignore.c \
irc-display.c
diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c
index 25b481aa7..2b0fee6a6 100644
--- a/src/irc/irc-channel.c
+++ b/src/irc/irc-channel.c
@@ -61,9 +61,7 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name)
new_channel->dcc_chat = NULL;
new_channel->name = strdup (channel_name);
new_channel->topic = NULL;
- new_channel->modes = (char *) malloc (NUM_CHANNEL_MODES + 1);
- memset (new_channel->modes, ' ', NUM_CHANNEL_MODES);
- new_channel->modes[NUM_CHANNEL_MODES] = '\0';
+ new_channel->modes = NULL;
new_channel->limit = 0;
new_channel->key = NULL;
new_channel->nicks_count = 0;
@@ -127,6 +125,10 @@ channel_free (t_irc_server *server, t_irc_channel *channel)
free (channel->name);
if (channel->topic)
free (channel->topic);
+ if (channel->modes)
+ free (channel->modes);
+ if (channel->key)
+ free (channel->key);
nick_free_all (channel);
if (channel->away_message)
free (channel->away_message);
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index be153aafa..98e88b84c 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -156,7 +156,7 @@ t_irc_command irc_commands[] =
" s: mark a user for receive server notices\n"
" w: user receives wallops\n"
" o: operator flag"),
- "", 1, MAX_ARGS, 0, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
+ "%c|%m", 1, MAX_ARGS, 0, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
{ "motd", N_("get the \"Message Of The Day\""),
N_("[target]"),
N_("target: server name"),
diff --git a/src/irc/irc-mode.c b/src/irc/irc-mode.c
new file mode 100644
index 000000000..9336cb802
--- /dev/null
+++ b/src/irc/irc-mode.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2003-2006 by FlashCode
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* irc-mode.c: IRC channel/user modes management */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+#include
+
+#include "../common/weechat.h"
+#include "irc.h"
+#include "../common/command.h"
+#include "../gui/gui.h"
+
+
+/*
+ * irc_mode_channel_set_nick: set a mode for a nick on a channel
+ */
+
+void
+irc_mode_channel_set_nick (t_irc_channel *channel, char *nick,
+ char set_flag, int flag)
+{
+ t_irc_nick *ptr_nick;
+
+ if (nick)
+ {
+ ptr_nick = nick_search (channel, nick);
+ if (ptr_nick)
+ {
+ NICK_SET_FLAG(ptr_nick, (set_flag == '+'), flag);
+ nick_resort (channel, ptr_nick);
+ gui_nicklist_draw (channel->buffer, 1, 1);
+ }
+ }
+}
+
+/*
+ * irc_mode_channel_get_flag: search for flag before current position
+ */
+
+char
+irc_mode_channel_get_flag (char *str, char *pos)
+{
+ char set_flag;
+
+ set_flag = '+';
+ pos--;
+ while (pos >= str)
+ {
+ if (pos[0] == '-')
+ return '-';
+ if (pos[0] == '+')
+ return '+';
+ pos--;
+ }
+ return set_flag;
+}
+
+/*
+ * irc_mode_channel_set: set channel modes
+ */
+
+void
+irc_mode_channel_set (t_irc_channel *channel, char *modes)
+{
+ char *pos_args, set_flag, **argv, *pos, *ptr_arg;
+ int argc, current_arg;
+
+ argc = 0;
+ argv = NULL;
+ current_arg = 0;
+ pos_args = strchr (modes, ' ');
+ if (pos_args)
+ {
+ pos_args[0] = '\0';
+ pos_args++;
+ while (pos_args[0] == ' ')
+ pos_args++;
+ argv = explode_string (pos_args, " ", 0, &argc);
+ if (argc > 0)
+ current_arg = argc - 1;
+ }
+
+ if (modes && modes[0])
+ {
+ set_flag = '+';
+ pos = modes + strlen (modes) - 1;
+ while (pos >= modes)
+ {
+ switch (pos[0])
+ {
+ case ':':
+ case ' ':
+ case '+':
+ case '-':
+ break;
+ default:
+ set_flag = irc_mode_channel_get_flag (modes, pos);
+ ptr_arg = ((argc > 0) && (current_arg >= 0)) ?
+ argv[current_arg--] : NULL;
+ switch (pos[0])
+ {
+ case 'h':
+ irc_mode_channel_set_nick (channel, ptr_arg,
+ set_flag, NICK_HALFOP);
+ break;
+ case 'k':
+ if (channel->key)
+ {
+ free (channel->key);
+ channel->key = NULL;
+ }
+ if ((set_flag == '+') && ptr_arg)
+ channel->key = strdup (ptr_arg);
+ break;
+ case 'l':
+ if (set_flag == '-')
+ channel->limit = 0;
+ if ((set_flag == '+') && ptr_arg)
+ channel->limit = atoi (ptr_arg);
+ break;
+ case 'o':
+ irc_mode_channel_set_nick (channel, ptr_arg,
+ set_flag, NICK_OP);
+ break;
+ case 'v':
+ irc_mode_channel_set_nick (channel, ptr_arg,
+ set_flag, NICK_VOICE);
+ break;
+ }
+ break;
+ }
+ pos--;
+ }
+ }
+
+ if (argv)
+ free_exploded_string (argv);
+}
+
+/*
+ * irc_mode_user_add: add a user mode
+ */
+
+void
+irc_mode_user_add (t_irc_server *server, char mode)
+{
+ char str_mode[2];
+
+ str_mode[0] = mode;
+ str_mode[1] = '\0';
+
+ if (server->nick_modes)
+ {
+ if (!strchr (server->nick_modes, mode))
+ {
+ server->nick_modes = (char *) realloc (server->nick_modes,
+ strlen (server->nick_modes) + 1 + 1);
+ strcat (server->nick_modes, str_mode);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
+ }
+ }
+ else
+ {
+ server->nick_modes = (char *) malloc (2);
+ strcpy (server->nick_modes, str_mode);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
+ }
+}
+
+/*
+ * irc_mode_user_remove: remove a user mode
+ */
+
+void
+irc_mode_user_remove (t_irc_server *server, char mode)
+{
+ char *pos;
+ int new_size;
+
+ if (server->nick_modes)
+ {
+ pos = strchr (server->nick_modes, mode);
+ if (pos)
+ {
+ new_size = strlen (server->nick_modes);
+ memmove (pos, pos + 1, strlen (pos + 1) + 1);
+ server->nick_modes = (char *) realloc (server->nick_modes,
+ new_size);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
+ }
+ }
+}
+
+/*
+ * irc_mode_user_set: set user modes
+ */
+
+void
+irc_mode_user_set (t_irc_server *server, char *modes)
+{
+ char set_flag;
+
+ set_flag = '+';
+ while (modes && modes[0])
+ {
+ switch (modes[0])
+ {
+ case ':':
+ case ' ':
+ break;
+ case '+':
+ set_flag = '+';
+ break;
+ case '-':
+ set_flag = '-';
+ break;
+ default:
+ if (set_flag == '+')
+ irc_mode_user_add (server, modes[0]);
+ else
+ irc_mode_user_remove (server, modes[0]);
+ break;
+ }
+ modes++;
+ }
+}
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index b9441d6a5..c2621897c 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -646,583 +646,6 @@ irc_cmd_recv_kill (t_irc_server *server, char *host, char *nick, char *arguments
return 0;
}
-/*
- * irc_get_channel_modes: get channel modes
- */
-
-void irc_get_channel_modes (t_irc_server *server, t_irc_channel *channel,
- char *channel_name,
- char *nick_host, char *modes, char *parm,
- int no_display)
-{
- char *pos, set_flag, unknown_mode[3];
- t_irc_nick *ptr_nick;
-
- set_flag = '+';
- while (modes && modes[0])
- {
- switch (modes[0])
- {
- case '+':
- set_flag = '+';
- break;
- case '-':
- set_flag = '-';
- break;
- case 'b':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "b", nick_host,
- (set_flag == '+') ?
- _("sets ban on") :
- _("removes ban on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'd':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "d", nick_host,
- (set_flag == '+') ?
- _("sets realname ban on") :
- _("removes realname ban on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'e':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "e", nick_host,
- (set_flag == '+') ?
- _("sets ban exemption on") :
- _("removes ban exemption on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'f':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "f", nick_host,
- (set_flag == '+') ?
- _("sets mode +f") :
- _("removes mode +f"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'h':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "h", nick_host,
- (set_flag == '+') ?
- _("gives half channel operator status to") :
- _("removes half channel operator status from"),
- (parm) ? parm : NULL);
- if (parm)
- {
- ptr_nick = nick_search (channel, parm);
- if (ptr_nick)
- {
- NICK_SET_FLAG(ptr_nick, (set_flag == '+'), NICK_HALFOP);
- nick_resort (channel, ptr_nick);
- gui_nicklist_draw (channel->buffer, 1, 1);
- }
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'i':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "i", nick_host,
- (set_flag == '+') ?
- _("sets invite-only channel flag") :
- _("removes invite-only channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_INVITE);
- break;
- case 'I':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "I", nick_host,
- (set_flag == '+') ?
- _("sets invite-only exemption on") :
- _("removes invite-only exemption on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'k':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "k", nick_host,
- (set_flag == '+') ?
- _("sets channel key to") :
- _("removes channel key"),
- (set_flag == '+') ?
- ((parm) ? parm : NULL) :
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_KEY);
- if (channel->key)
- free (channel->key);
- channel->key = strdup (parm);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'l':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "l", nick_host,
- (set_flag == '+') ?
- _("sets the user limit to") :
- _("removes user limit"),
- (set_flag == '+') ?
- ((parm) ? parm : NULL) :
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_LIMIT);
- if (set_flag == '-')
- channel->limit = 0;
- if ((set_flag == '+') && parm)
- channel->limit = atoi (parm);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'm':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "m", nick_host,
- (set_flag == '+') ?
- _("sets moderated channel flag") :
- _("removes moderated channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_MODERATED);
- break;
- case 'n':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "n", nick_host,
- (set_flag == '+') ?
- _("sets messages from channel only flag") :
- _("removes messages from channel only flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_NO_MSG_OUT);
- break;
- case 'o':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "o", nick_host,
- (set_flag == '+') ?
- _("gives channel operator status to") :
- _("removes channel operator status from"),
- (parm) ? parm : NULL);
- if (parm)
- {
- ptr_nick = nick_search (channel, parm);
- if (ptr_nick)
- {
- NICK_SET_FLAG(ptr_nick, (set_flag == '+'), NICK_OP);
- nick_resort (channel, ptr_nick);
- gui_nicklist_draw (channel->buffer, 1, 1);
- }
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'p':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "p", nick_host,
- (set_flag == '+') ?
- _("sets private channel flag") :
- _("removes private channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_PRIVATE);
- break;
- case 'q':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "q", nick_host,
- (set_flag == '+') ?
- _("sets quiet on") :
- _("removes quiet on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 's':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "s", nick_host,
- (set_flag == '+') ?
- _("sets secret channel flag") :
- _("removes secret channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_SECRET);
- break;
- case 't':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "t", nick_host,
- (set_flag == '+') ?
- _("sets topic protection") :
- _("removes topic protection"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_TOPIC);
- break;
- case 'v':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "v", nick_host,
- (set_flag == '+') ?
- _("gives voice to") :
- _("removes voice from"),
- (parm) ? parm : NULL);
-
- if (parm)
- {
- ptr_nick = nick_search (channel, parm);
- if (ptr_nick)
- {
- NICK_SET_FLAG(ptr_nick, (set_flag == '+'), NICK_VOICE);
- nick_resort (channel, ptr_nick);
- gui_nicklist_draw (channel->buffer, 1, 1);
- }
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- default: /* unknown mode received */
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- {
- unknown_mode[0] = set_flag;
- unknown_mode[1] = modes[0];
- unknown_mode[2] = '\0';
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- unknown_mode + 1, nick_host,
- unknown_mode,
- (parm) ? parm : NULL);
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- }
- modes++;
- }
-}
-
-/*
- * irc_get_nick_modes: get nick modes
- */
-
-void irc_get_nick_modes (t_irc_server *server,
- char *nick_host, char *modes, int no_display)
-{
- char set_flag, unknown_mode[3];
-
- set_flag = '+';
- while (modes && modes[0])
- {
- switch (modes[0])
- {
- case ':':
- break;
- case '+':
- set_flag = '+';
- break;
- case '-':
- set_flag = '-';
- break;
- case 'a':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "a", nick_host,
- (set_flag == '+') ?
- _("sets away") :
- _("removes away"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_AWAY);
- break;
- case 'i':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "i", nick_host,
- (set_flag == '+') ?
- _("sets invisible") :
- _("removes invisible"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_INVISIBLE);
- break;
- case 'w':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "w", nick_host,
- (set_flag == '+') ?
- _("sets wallops") :
- _("removes wallops"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_WALLOPS);
- break;
- case 'r':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "r", nick_host,
- (set_flag == '+') ?
- _("sets restricted") :
- _("removes restricted"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_RESTRICTED);
- break;
- case 'o':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "o", nick_host,
- (set_flag == '+') ?
- _("sets operator") :
- _("removes operator"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_OPERATOR);
- break;
- case 'O':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "O", nick_host,
- (set_flag == '+') ?
- _("sets local operator") :
- _("removes local operator"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_LOCAL_OPERATOR);
- break;
- case 's':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "s", nick_host,
- (set_flag == '+') ?
- _("sets server notices") :
- _("removes server notices"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_LOCAL_OPERATOR);
- break;
- default: /* unknown mode received */
- if (nick_host && !no_display)
- {
- unknown_mode[0] = set_flag;
- unknown_mode[1] = modes[0];
- unknown_mode[2] = '\0';
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- unknown_mode + 1, nick_host,
- unknown_mode, NULL);
- }
- break;
- }
- modes++;
- }
-}
-
/*
* irc_cmd_recv_mode: 'mode' message received
*/
@@ -1230,7 +653,7 @@ void irc_get_nick_modes (t_irc_server *server,
int
irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_parm;
+ char *pos_modes, *pos;
t_irc_channel *ptr_channel;
/* no host => we can't identify sender of message! */
@@ -1243,8 +666,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
return -1;
}
- pos = strchr (arguments, ' ');
- if (!pos)
+ pos_modes = strchr (arguments, ' ');
+ if (!pos_modes)
{
irc_display_prefix (server, server->buffer, PREFIX_ERROR);
gui_printf_nolog (server->buffer,
@@ -1252,18 +675,19 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
WEECHAT_ERROR, "mode");
return -1;
}
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
+ pos_modes[0] = '\0';
+ pos_modes++;
+ while (pos_modes[0] == ' ')
+ pos_modes++;
+ if (pos_modes[0] == ':')
+ pos_modes++;
- pos_parm = strchr (pos, ' ');
- if (pos_parm)
+ /* remove spaces after modes */
+ pos = pos_modes + strlen (pos_modes) - 1;
+ while ((pos >= pos_modes) && (pos[0] == ' '))
{
- pos_parm[0] = '\0';
- pos_parm++;
- while (pos_parm[0] == ' ')
- pos_parm++;
+ pos[0] = '\0';
+ pos--;
}
if (string_is_channel (arguments))
@@ -1271,10 +695,23 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
ptr_channel = channel_search (server, arguments);
if (ptr_channel)
{
- irc_get_channel_modes (server, ptr_channel, arguments, nick,
- pos, pos_parm, command_ignored);
- gui_status_draw (ptr_channel->buffer, 1);
- gui_input_draw (ptr_channel->buffer, 1);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
+ gui_printf (ptr_channel->buffer,
+ _("Mode %s%s %s[%s%s%s]%s by %s%s\n"),
+ GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+ ptr_channel->name,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
+ pos_modes,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
+ GUI_COLOR(COLOR_WIN_CHAT_NICK),
+ nick);
+ }
+ irc_mode_channel_set (ptr_channel, pos_modes);
+ server_sendf (server, "MODE %s\r\n", ptr_channel->name);
}
else
{
@@ -1287,9 +724,19 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
}
else
{
- irc_get_nick_modes (server, nick, pos, command_ignored);
- gui_status_draw (gui_current_window->buffer, 1);
- gui_input_draw (gui_current_window->buffer, 1);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("User mode %s%s %s[%s%s%s]\n"),
+ GUI_COLOR(COLOR_WIN_CHAT_NICK),
+ nick,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
+ pos_modes,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK));
+ }
+ irc_mode_user_set (server, pos_modes);
}
return 0;
}
@@ -2957,12 +2404,13 @@ irc_cmd_recv_221 (t_irc_server *server, char *host, char *nick, char *arguments)
if (!command_ignored)
{
irc_display_prefix (server, server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, _("User mode %s[%s%s%s/%s%s%s]\n"),
- GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ gui_printf (server->buffer,
+ _("User mode for %s%s%s is %s[%s%s%s]\n"),
GUI_COLOR(COLOR_WIN_CHAT_NICK),
arguments,
GUI_COLOR(COLOR_WIN_CHAT),
- GUI_COLOR(COLOR_WIN_CHAT_NICK),
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
pos_mode,
GUI_COLOR(COLOR_WIN_CHAT_DARK));
}
@@ -3931,7 +3379,7 @@ irc_cmd_recv_323 (t_irc_server *server, char *host, char *nick, char *arguments)
int
irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos_channel, *pos, *pos_parm;
+ char *pos_channel, *pos_modes, *pos;
t_irc_channel *ptr_channel;
/* make gcc happy */
@@ -3946,28 +3394,44 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
while (pos_channel[0] == ' ')
pos_channel++;
- pos = strchr (pos_channel, ' ');
- if (pos)
+ pos_modes = strchr (pos_channel, ' ');
+ if (pos_modes)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
-
- pos_parm = strchr (pos, ' ');
- if (pos_parm)
+ pos_modes[0] = '\0';
+ pos_modes++;
+ while (pos_modes[0] == ' ')
+ pos_modes++;
+
+ /* remove spaces after modes */
+ pos = pos_modes + strlen (pos_modes) - 1;
+ while ((pos >= pos_modes) && (pos[0] == ' '))
{
- pos_parm[0] = '\0';
- pos_parm++;
- while (pos_parm[0] == ' ')
- pos_parm++;
+ pos[0] = '\0';
+ pos--;
}
+
+ /* search channel */
ptr_channel = channel_search (server, pos_channel);
if (ptr_channel)
{
- irc_get_channel_modes (server, ptr_channel, NULL, NULL,
- pos, pos_parm, command_ignored);
- gui_status_draw (ptr_channel->buffer, 0);
+ if (pos_modes[0])
+ {
+ if (ptr_channel->modes)
+ ptr_channel->modes = (char *) realloc (ptr_channel->modes,
+ strlen (pos_modes) + 1);
+ else
+ ptr_channel->modes = (char *) malloc (strlen (pos_modes) + 1);
+ strcpy (ptr_channel->modes, pos_modes);
+ }
+ else
+ {
+ if (ptr_channel->modes)
+ {
+ free (ptr_channel->modes);
+ ptr_channel->modes = NULL;
+ }
+ }
+ gui_status_draw (ptr_channel->buffer, 1);
}
}
}
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index ff3337868..498cdc09e 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -102,9 +102,7 @@ server_init (t_irc_server *server)
server->ssl_connected = 0;
server->unterminated_message = NULL;
server->nick = NULL;
- server->nick_modes = (char *) malloc (NUM_NICK_MODES + 1);
- memset (server->nick_modes, ' ', NUM_NICK_MODES);
- server->nick_modes[NUM_NICK_MODES] = '\0';
+ server->nick_modes = NULL;
server->reconnect_start = 0;
server->reconnect_join = 0;
server->is_away = 0;
@@ -1755,8 +1753,8 @@ server_disconnect (t_irc_server *server, int reconnect)
if (server->nick_modes)
{
- memset (server->nick_modes, ' ', NUM_NICK_MODES);
- server->nick_modes[NUM_NICK_MODES] = '\0';
+ free (server->nick_modes);
+ server->nick_modes = NULL;
}
server->is_away = 0;
server->away_time = 0;
diff --git a/src/irc/irc.h b/src/irc/irc.h
index 62b8364cb..3b130a89c 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -85,21 +85,6 @@ struct t_irc_nick
#define CHANNEL_TYPE_PRIVATE 1
#define CHANNEL_TYPE_DCC_CHAT 2
-#define NUM_CHANNEL_MODES 8
-#define CHANNEL_MODE_INVITE 0
-#define CHANNEL_MODE_KEY 1
-#define CHANNEL_MODE_LIMIT 2
-#define CHANNEL_MODE_MODERATED 3
-#define CHANNEL_MODE_NO_MSG_OUT 4
-#define CHANNEL_MODE_SECRET 5
-#define CHANNEL_MODE_TOPIC 6
-#define CHANNEL_MODE_PRIVATE 7
-#define CHANNEL_SET_MODE(channel, set, mode) \
- if (set) \
- channel->modes[mode] = channel_modes[mode]; \
- else \
- channel->modes[mode] = ' ';
-
typedef struct t_irc_channel t_irc_channel;
struct t_irc_channel
@@ -125,20 +110,6 @@ struct t_irc_channel
/* server types */
-#define NUM_NICK_MODES 7
-#define NICK_MODE_AWAY 0
-#define NICK_MODE_INVISIBLE 1
-#define NICK_MODE_WALLOPS 2
-#define NICK_MODE_RESTRICTED 3
-#define NICK_MODE_OPERATOR 4
-#define NICK_MODE_LOCAL_OPERATOR 5
-#define NICK_MODE_SERVER_NOTICES 6
-#define NICK_SET_MODE(server, set, mode) \
- if (set) \
- server->nick_modes[mode] = nick_modes[mode]; \
- else \
- server->nick_modes[mode] = ' ';
-
typedef struct t_irc_server t_irc_server;
struct t_irc_server
@@ -432,6 +403,11 @@ extern int nick_get_max_length (t_irc_channel *);
extern void nick_set_away (t_irc_channel *, t_irc_nick *, int);
extern void nick_print_log (t_irc_nick *);
+/* mode functions (irc-mode.c) */
+
+extern void irc_mode_channel_set (t_irc_channel *, char *);
+extern void irc_mode_user_set (t_irc_server *, char *);
+
/* DCC functions (irc-dcc.c) */
extern void dcc_redraw (int);
diff --git a/src/plugins/plugins-interface.c b/src/plugins/plugins-interface.c
index 16a49ebbb..28343746e 100644
--- a/src/plugins/plugins-interface.c
+++ b/src/plugins/plugins-interface.c
@@ -834,6 +834,7 @@ weechat_plugin_get_server_info (t_weechat_plugin *plugin)
new_server_info->is_connected = ptr_server->is_connected;
new_server_info->ssl_connected = ptr_server->ssl_connected;
new_server_info->nick = (ptr_server->nick) ? strdup (ptr_server->nick) : strdup ("");
+ new_server_info->nick_modes = (ptr_server->nick_modes) ? strdup (ptr_server->nick_modes) : strdup ("");
new_server_info->is_away = ptr_server->is_away;
new_server_info->away_time = ptr_server->away_time;
new_server_info->lag = ptr_server->lag;
diff --git a/src/plugins/scripts/lua/weechat-lua.c b/src/plugins/scripts/lua/weechat-lua.c
index 0398365bf..4d70d61f0 100644
--- a/src/plugins/scripts/lua/weechat-lua.c
+++ b/src/plugins/scripts/lua/weechat-lua.c
@@ -1371,6 +1371,10 @@ weechat_lua_get_server_info (lua_State *L)
lua_pushstring (lua_current_interpreter, "nick");
lua_pushstring (lua_current_interpreter, ptr_server->nick);
lua_rawset (lua_current_interpreter, -3);
+
+ lua_pushstring (lua_current_interpreter, "nick_modes");
+ lua_pushstring (lua_current_interpreter, ptr_server->nick_modes);
+ lua_rawset (lua_current_interpreter, -3);
lua_pushstring (lua_current_interpreter, "away_time");
lua_pushstring (lua_current_interpreter, timebuffer);
diff --git a/src/plugins/scripts/perl/weechat-perl.c b/src/plugins/scripts/perl/weechat-perl.c
index 52ac3e8a4..599d5754f 100644
--- a/src/plugins/scripts/perl/weechat-perl.c
+++ b/src/plugins/scripts/perl/weechat-perl.c
@@ -1163,6 +1163,7 @@ static XS (XS_weechat_get_server_info)
hv_store (server_hash_member, "is_connected", 12, newSViv (ptr_server->is_connected), 0);
hv_store (server_hash_member, "ssl_connected", 13, newSViv (ptr_server->ssl_connected), 0);
hv_store (server_hash_member, "nick", 4, newSVpv (ptr_server->nick, 0), 0);
+ hv_store (server_hash_member, "nick_modes", 10, newSVpv (ptr_server->nick_modes, 0), 0);
hv_store (server_hash_member, "away_time", 9, newSVpv (timebuffer, 0), 0);
hv_store (server_hash_member, "lag", 3, newSViv (ptr_server->lag), 0);
diff --git a/src/plugins/scripts/python/weechat-python.c b/src/plugins/scripts/python/weechat-python.c
index a54e6884f..7643a7088 100644
--- a/src/plugins/scripts/python/weechat-python.c
+++ b/src/plugins/scripts/python/weechat-python.c
@@ -1134,6 +1134,8 @@ weechat_python_get_server_info (PyObject *self, PyObject *args)
Py_BuildValue("i", ptr_server->ssl_connected));
PyDict_SetItem(server_hash_member, Py_BuildValue("s", "nick"),
Py_BuildValue("s", ptr_server->nick));
+ PyDict_SetItem(server_hash_member, Py_BuildValue("s", "nick_modes"),
+ Py_BuildValue("s", ptr_server->nick_modes));
PyDict_SetItem(server_hash_member, Py_BuildValue("s", "away_time"),
Py_BuildValue("s", timebuffer));
PyDict_SetItem(server_hash_member, Py_BuildValue("s", "lag"),
diff --git a/src/plugins/scripts/ruby/weechat-ruby.c b/src/plugins/scripts/ruby/weechat-ruby.c
index b813a5018..034847a37 100644
--- a/src/plugins/scripts/ruby/weechat-ruby.c
+++ b/src/plugins/scripts/ruby/weechat-ruby.c
@@ -1354,6 +1354,8 @@ weechat_ruby_get_server_info (VALUE class)
INT2FIX(ptr_server->ssl_connected));
rb_hash_aset (server_hash_member, rb_str_new2("nick"),
rb_str_new2(ptr_server->nick));
+ rb_hash_aset (server_hash_member, rb_str_new2("nick_modes"),
+ rb_str_new2(ptr_server->nick_modes));
rb_hash_aset (server_hash_member, rb_str_new2("away_time"),
rb_str_new2(timebuffer));
rb_hash_aset (server_hash_member, rb_str_new2("lag"),
diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h
index 6c26ecedb..1f550fc87 100644
--- a/src/plugins/weechat-plugin.h
+++ b/src/plugins/weechat-plugin.h
@@ -107,6 +107,7 @@ struct t_plugin_server_info
int is_connected; /* 1 if WeeChat is connected to server */
int ssl_connected; /* = 1 if connected with SSL */
char *nick; /* current nickname */
+ char *nick_modes; /* nick modes */
int is_away; /* 1 is user is marker as away */
time_t away_time; /* time() when user marking as away */
int lag; /* lag (in milliseconds) */
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index c06e3c792..837da38fc 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,9 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2006-08-05
+ChangeLog - 2006-08-08
Version 0.2.0 (under dev!):
+ * added missing modes (channel & user), now all modes are allowed (bug #16606)
+ * added "%m" for completion with self nick (on current server)
* added missing IRC command 338
* fixed DCC restore after /upgrade (order is now correctly saved)
* fixed away after server disconnection (now away is set again when
diff --git a/weechat/doc/de/weechat.de.xml b/weechat/doc/de/weechat.de.xml
index 07c5534ae..083ef6294 100644
--- a/weechat/doc/de/weechat.de.xml
+++ b/weechat/doc/de/weechat.de.xml
@@ -1991,6 +1991,10 @@ plugin->msg_handler_add (plugin, "KICK", &msg_kick, NULL, NULL);
%k
Grundfunktionen
+
+ %m
+ Nicknamen des gegenwrtigen Servers
+
%n
Nicknamen des gegenwrtigen Channels
diff --git a/weechat/doc/en/weechat.en.xml b/weechat/doc/en/weechat.en.xml
index 9432f1e38..d27258cc4 100644
--- a/weechat/doc/en/weechat.en.xml
+++ b/weechat/doc/en/weechat.en.xml
@@ -2008,6 +2008,10 @@ plugin->msg_handler_add (plugin, "KICK", &msg_kick, NULL, NULL);
%k
key functions
+
+ %m
+ nick on current server
+
%n
nicks of current channel
diff --git a/weechat/doc/fr/weechat.fr.xml b/weechat/doc/fr/weechat.fr.xml
index 82eb1cc22..c05258ce5 100644
--- a/weechat/doc/fr/weechat.fr.xml
+++ b/weechat/doc/fr/weechat.fr.xml
@@ -2049,6 +2049,10 @@ plugin->msg_handler_add (plugin, "KICK", &msg_kick, NULL, NULL);
%k
fonctions associes aux touches
+
+ %m
+ pseudo sur le serveur courant
+
%n
pseudos du canal courant
diff --git a/weechat/po/POTFILES.in b/weechat/po/POTFILES.in
index 9b55f49d2..d38d300ca 100644
--- a/weechat/po/POTFILES.in
+++ b/weechat/po/POTFILES.in
@@ -1,3 +1,4 @@
+./src/irc/irc-mode.c
./src/irc/irc-nick.c
./src/irc/irc-server.c
./src/irc/irc-channel.c
@@ -67,6 +68,8 @@
./src/common/session.h
./src/common/utf8.c
./src/common/utf8.h
+./src/common/util.c
+./src/common/util.h
./src/common/weechat.c
./src/common/weechat.h
./src/common/weeconfig.c
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index 496fa5824..cf26ae34e 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-07-25 20:00+0200\n"
"Last-Translator: Jiri Golembiovsky \n"
"Language-Team: weechat-dev \n"
@@ -14,87 +14,87 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Nemůžu získat jméno uživatele"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s nemůžu přidělit nový server\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Příkaz \"%s\" selhal\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Žádný příkaz pro provedení!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s handshake s gnutls selhal\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresa proxy \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresa \"%s\" nenalezena\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP adresa proxy nenalezena\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP adresa nenalezena\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s proxy odmítla spojení\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s spojení odmítnuto\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -103,12 +103,12 @@ msgstr ""
"%s selhalo zjednání spojení s proxy serverem (zkontrolujte uživatelské jméno "
"a heslo pokud jsou vyžadovány)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, 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:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -116,57 +116,57 @@ msgstr ""
"%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou "
"GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s chyba inicializace gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s nemohu vytvořit rouru\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nemohu vytvořit soket\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Připojuji se znovu k serveru...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Odpojen od serveru!\n"
@@ -1351,7 +1351,7 @@ msgstr "off"
msgid " (temporary server, will not be saved)"
msgstr " (dočasný server, nebude uložen)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "sekund"
@@ -1434,9 +1434,9 @@ msgstr "%s, kompilováno na %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n"
@@ -1466,489 +1466,307 @@ msgstr "%s%s%s byl zabit %s%s%s ze serveru"
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:685
-msgid "sets ban on"
-msgstr "tě zakázal"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "odebral zakázaní"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "nastavil povolení zakázání skutečného jména"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "odebral povolení zakázaní skutečného jména"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "nastavena vyjímka zakázání na"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "odstraněna vyjímka zakázání z"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "nastavil mód +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "odstranil mód +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "dal poloviční status operátora na"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "odebral poloviční status operátora z"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "nastavil zančku kanálu: pouze na pování"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "odebral značku kanálu: pouze na pozvání"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "nastavena vyjímka pouze na pozvání na"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "odstraněna vyjímka pouze na pozvání z"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "nastavil klíč kanálu na"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "odebral klíč kanálu"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "nastavil limit uživatelů na"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "odebral limit uživatelů"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "nastavil značku moderovaného kanálu"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "odebral značku moderovaného kanálu"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "nastavil značku kanálu: zprávy pouze z kanálu"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "odebral značku kanálu: zprávy pouze z kanálu"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "dal status operátora na"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "odebral status operátora z"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "nastavil značku soukromého kanálu"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "odebral značku soukromého kanálu"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "nastavil ticho na"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "odebral ticho z"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "nastavil značku tajného kanálu"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "odebral značku tajného kanálu"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "nastavil protekci tématu"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "odebral protekci tématu"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "dal voice na"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "odebral voice z"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "nastavil nepřítomnost"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "odebral nepřítomnost"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "nastavil neviditelnost"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "odebral neviditelnost"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "nastavil wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "odebral wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "nastavil soukromý"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "odebral soukromý"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "nastavil operátora"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "odebral operátora"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "nastavil lokálního operátora"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "odebral lokálního operátora"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "nastavil upozornění serveru"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "odebrat upozornění serveru"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, 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:1251
+#: src/irc/irc-recv.c:674
#, 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:1354
+#: src/irc/irc-recv.c:702
+#, 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 byl %s\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Uživatelský mód %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Nyní známý jako %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s nyní známý jako %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s přezdívka nenalezena pro příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s odpověď od %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s odpověď od %s%s%s: %ld.%ld sekund\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s nemohu vytvořít nové soukromé okno\"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Soukromý"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s \"%s\" příkaz obdržen bez hosta nebo kanálu\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s opustil %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Kanálu"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Obdržen CTCP %sZVUK%s \"%s\" od %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s obdržen od %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "Neznámý CTCP %s%s%s obdržen od %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s obdržen od %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s neznámý DCC CHAT typ obdržen od "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, 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:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, c-format
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Uživatelský mód %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s je pryč: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Uživatelů online: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s nečinný: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "dní"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "den"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "hodin"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "hodina"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "minut"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "minuta"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "sekunda"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Není nastaveno téma pro %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Téma pro %s%s%s je: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Téma nastevil %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Přezdívkz %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, 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:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "přezdívky"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "přezdívka"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "částeční-ops"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "částečný-op"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normální"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1957,13 +1775,13 @@ 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:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "neznámý"
@@ -2390,27 +2208,27 @@ msgstr "GB"
msgid "ETA"
msgstr "ETA"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Akceptovat"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Storno"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Odebrat"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Zavřít čistý pohled na data"
@@ -2432,28 +2250,28 @@ msgstr ""
msgid "(away)"
msgstr "(pryč)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[nepřipojen] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr "<ČISTÉ_IRC> "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Aktivní: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "ČISTÉ_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Zpoždění: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-VÍCE-"
@@ -2461,7 +2279,7 @@ msgstr "-VÍCE-"
msgid "server"
msgstr "server"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Nedostatek paměti pro nový řádek\n"
@@ -5727,6 +5545,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Ukládám konfiguraci na disk\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Uživatelský mód %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "nastavil nepřítomnost"
+
+#~ msgid "removes away"
+#~ msgstr "odebral nepřítomnost"
+
+#~ msgid "sets invisible"
+#~ msgstr "nastavil neviditelnost"
+
+#~ msgid "removes invisible"
+#~ msgstr "odebral neviditelnost"
+
+#~ msgid "sets wallops"
+#~ msgstr "nastavil wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "odebral wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "nastavil soukromý"
+
+#~ msgid "removes restricted"
+#~ msgstr "odebral soukromý"
+
+#~ msgid "sets operator"
+#~ msgstr "nastavil operátora"
+
+#~ msgid "removes operator"
+#~ msgstr "odebral operátora"
+
+#~ msgid "sets local operator"
+#~ msgstr "nastavil lokálního operátora"
+
+#~ msgid "removes local operator"
+#~ msgstr "odebral lokálního operátora"
+
+#~ msgid "sets server notices"
+#~ msgstr "nastavil upozornění serveru"
+
+#~ msgid "removes server notices"
+#~ msgstr "odebrat upozornění serveru"
+
+#~ msgid "sets ban on"
+#~ msgstr "tě zakázal"
+
+#~ msgid "removes ban on"
+#~ msgstr "odebral zakázaní"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "nastavil povolení zakázání skutečného jména"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "odebral povolení zakázaní skutečného jména"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "nastavena vyjímka zakázání na"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "odstraněna vyjímka zakázání z"
+
+#~ msgid "sets mode +f"
+#~ msgstr "nastavil mód +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "odstranil mód +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "dal poloviční status operátora na"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "odebral poloviční status operátora z"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "nastavil zančku kanálu: pouze na pování"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "odebral značku kanálu: pouze na pozvání"
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "nastavena vyjímka pouze na pozvání na"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "odstraněna vyjímka pouze na pozvání z"
+
+#~ msgid "sets channel key to"
+#~ msgstr "nastavil klíč kanálu na"
+
+#~ msgid "removes channel key"
+#~ msgstr "odebral klíč kanálu"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "nastavil limit uživatelů na"
+
+#~ msgid "removes user limit"
+#~ msgstr "odebral limit uživatelů"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "nastavil značku moderovaného kanálu"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "odebral značku moderovaného kanálu"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "nastavil značku kanálu: zprávy pouze z kanálu"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "odebral značku kanálu: zprávy pouze z kanálu"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "dal status operátora na"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "odebral status operátora z"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "nastavil značku soukromého kanálu"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "odebral značku soukromého kanálu"
+
+#~ msgid "sets quiet on"
+#~ msgstr "nastavil ticho na"
+
+#~ msgid "removes quiet on"
+#~ msgstr "odebral ticho z"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "nastavil značku tajného kanálu"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "odebral značku tajného kanálu"
+
+#~ msgid "sets topic protection"
+#~ msgstr "nastavil protekci tématu"
+
+#~ msgid "removes topic protection"
+#~ msgstr "odebral protekci tématu"
+
+#~ msgid "gives voice to"
+#~ msgstr "dal voice na"
+
+#~ msgid "removes voice from"
+#~ msgstr "odebral voice z"
+
#~ msgid "Kb"
#~ msgstr "Kb"
diff --git a/weechat/po/de.po b/weechat/po/de.po
index 21b1d9fa2..40337693f 100644
--- a/weechat/po/de.po
+++ b/weechat/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
-"PO-Revision-Date: 2006-07-30 19:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
+"PO-Revision-Date: 2006-08-07 18:36+0200\n"
"Last-Translator: Thomas Schuetz \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,87 +18,87 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Username konnte nicht ermittelt werden"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s Neuer Server konnte nicht alloziert werden\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s der Befehl \"%s\" schlug fehl!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Kein Befehl zum Ausführen!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Neuverbinden in %d Sekunden\n"
-#: src/irc/irc-server.c:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls-Handshake schlug fehl\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s Proxyadresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s Adresse \"%s\" nicht gefunden\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s Proxy-IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-Adresse nicht gefunden\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s Proxyverbindung verweigert\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s Verbindungsaufbau verweigert\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -107,12 +107,12 @@ msgstr ""
"%s Der Proxy konnte die Verbindung zum Server nicht aufbauen (bitte "
"Benutzername/Passwort überprüfen)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, 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:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -120,57 +120,57 @@ msgstr ""
"%s SSL-Verbindung nicht möglich, da WeeChat nicht mit GNUtls-Support "
"kompiliert wurde\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls Initialisierungsfehler\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s Pipe konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s Socket konnte nicht angelegt werden\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Neuverbinden zum Server...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Vom Server getrennt!\n"
@@ -1047,9 +1047,8 @@ msgid "infos about topic (nick and date changed)"
msgstr "Topic-Informationen (Nick und Änderungsdatum)"
#: src/irc/irc-commands.c:361
-#, fuzzy
msgid "whois (host)"
-msgstr "whois (Benutzername)"
+msgstr "whois (Host)"
#: src/irc/irc-commands.c:363
msgid "inviting"
@@ -1351,7 +1350,7 @@ msgstr "aus"
msgid " (temporary server, will not be saved)"
msgstr " (temporärer Server, wird nicht gespeichert)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "Sekunden"
@@ -1435,9 +1434,9 @@ msgstr "%s, kompiliert auf %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s Channel \"%s\" für den \"%s\"-Befehl nicht gefunden\n"
@@ -1467,490 +1466,308 @@ msgstr "%s%s%s hat %s%s%s vom Server getrennt"
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:685
-msgid "sets ban on"
-msgstr "verbannt"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "entbannt"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "setzt Realnamenbann für"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "entfernt Realnamenbann von"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "setzt Bann-Ausnahme für"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "entfernt Bann-Ausnahme für"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "setzt Channelmodus +f (forward on uninvited)"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "entfernt Channelmodus +f (forward on uninvited)"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "verleiht Halboperatorstatus an"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "entfernt den Halboperatorstatus von"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "setzt das Flag \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "entfernt das Flag \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "setzt Ausnahme für \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "entfernt Ausnahme für \"Zutritt nur mit Einladung\""
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "setzt den Channelkey auf"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "entfernt den Channelkey"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "setzt das Userlimit auf"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "entfernt das Userlimit"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "setzt den Channel auf moderiert"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "entfernt das moderiert-Flag"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "blockiert Nachrichten von außen"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "erlaubt Nachrichten von außen"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "verleiht Operatorstatus an"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "aberkennt den Operatorstatus von"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "setzt das privat-Flag"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "entfernt das privat-Flag"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "setzt das quiet-Flag"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "entfernt das quiet-Flag"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "setzt das geheim-Flag"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "entfernt das geheim-Flag"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "sperrt das Topic"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "gibt das Topic frei"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "vergibt Voice an"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "entfernt Voice von"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "aktiviert Abwesenheitsstatus"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "deaktiviert Abwesenheitsstatus"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "aktiviert Unsichtbarkeitsstatus"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "deaktiviert Unsichtbarkeitsstatus"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "aktiviert den Empfang von Wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "deaktiviert den Empfang von Wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "aktiviert die eingeschränkte Verbindung"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "deaktiviert die eingeschränkte Verbindung"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "vergibt Operatorstatus"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "entfernt Operatorstatus"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "vergibt lokalen Oeratorstatus"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "entfernt lokalen Operatorstatus"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "aktiviert Servernachrichten"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "deaktiviert Servernachrichten"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Host\n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, 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:1354
+#: src/irc/irc-recv.c:702
+#, 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 war %s\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Usermodus %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Sie sind nun als %s%s bekannt\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s ist nun bekannt als %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s Nickname nicht gefunden für den \"%s\"-Befehl\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s Antwort von %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s Antwort von %s%s%s: %ld.%ld Sekunden\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Privat:"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Host oder Channel\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s verlässt %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Channel"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Ein CTCP %sSOUND%s \"%s\" wurde von %s%s empfangen\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s wurde von %s%s empfangen\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "Unbekannter CTCP %s%s%s von %s%s empfangen"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s von %s%s empfangen"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s unbekannter DCC CHAT-Typ emfpangen von "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\"-Befehl empfangen ohne Channel\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, c-format
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Usermodus %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s ist abwesend: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "User online: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s idlet: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "Tage"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "Tag"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "Stunden"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "Stunde"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "Minuten"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "Minute"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "Sekunde"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Kein Topic gesetzt für %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Das Topic von %s%s%s lautet: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Topic gesetzt von %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Nicks %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, 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:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "Nicks"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "Nick"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "Operatoren"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "Operator"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "Halb-Operatoren"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "Halb-Operator"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "Gevoicete"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "Gevoiceter"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1959,13 +1776,13 @@ msgstr ""
"%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
"getrennt!\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "unbekannt"
@@ -2136,59 +1953,59 @@ msgid "Private %s> %s"
msgstr "Privat %s> %s"
#: src/irc/irc-dcc.c:1370
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to create pipe\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann keine Pipe erstellen\n"
#: src/irc/irc-dcc.c:1598
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to read local file\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann lokale Datei nicht lesen\n"
#: src/irc/irc-dcc.c:1605
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to send block to receiver\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann den Block nicht an den Empfänger übertragen\n"
#: src/irc/irc-dcc.c:1612
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to read ACK from receiver\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann kein ACK vom Empfänger empfangen\n"
#: src/irc/irc-dcc.c:1620
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to connect to sender\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann keine Verbindung zum Sender herstellen\n"
#: src/irc/irc-dcc.c:1627
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to receive block from sender\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann Block nicht vom Sender empfangen\n"
#: src/irc/irc-dcc.c:1634
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to write local file\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann lokalen Datei nicht schreiben\n"
#: src/irc/irc-dcc.c:1687 src/irc/irc-dcc.c:1730
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to fork\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann nicht forken\n"
#: src/irc/irc-dcc.c:1770
#, c-format
msgid "%s DCC: timeout\n"
-msgstr ""
+msgstr "%s DCC: Timeout\n"
#: src/irc/irc-dcc.c:1802
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to create socket for sending file\n"
-msgstr "%s kann lokalen Hostname/lokale IP nicht festlegen\n"
+msgstr "%s DCC: kann keinen Socket für den Dateiversand erstellen\n"
#: src/irc/irc-dcc.c:1814
-#, fuzzy, c-format
+#, c-format
msgid "%s DCC: unable to set 'nonblock' option for socket\n"
-msgstr "%s kann den Server nicht anlegen\n"
+msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n"
#: src/irc/irc-dcc.c:1898
#, c-format
@@ -2384,48 +2201,48 @@ msgstr "Bytes"
#: src/gui/curses/gui-curses-chat.c:880
msgid "KB"
-msgstr ""
+msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:880
msgid "MB"
-msgstr ""
+msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:880
msgid "GB"
-msgstr ""
+msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1012
msgid "ETA"
msgstr "ETA"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] annehmen"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] abbrechen"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] entfernen"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] alte DCCs entfernen"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] DCC-Ansicht schließen"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Rohdatenansicht schließen"
#: src/gui/curses/gui-curses-main.c:99
#, c-format
msgid "Day changed to %s\n"
-msgstr "Ein neuer Tag bricht hat, heute ist der %s\n"
+msgstr "Ein neuer Tag bricht an, heute ist der %s\n"
#: src/gui/curses/gui-curses-main.c:214
#, c-format
@@ -2440,28 +2257,28 @@ msgstr ""
msgid "(away)"
msgstr "(abwesend)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[nicht verbunden]"
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Aktiv: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "RAW_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-MEHR-"
@@ -2469,7 +2286,7 @@ msgstr "-MEHR-"
msgid "server"
msgstr "Server"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Nicht genügend Speicher für neue Zeile\n"
@@ -5264,9 +5081,8 @@ msgid "block size for dcc packets in bytes (default: 65536)"
msgstr "Blockgröße für DCCs"
#: src/common/weeconfig.c:831 src/common/weeconfig.c:832
-#, fuzzy
msgid "does not wait for ACK when sending file"
-msgstr "Leerzeichen in Unterstriche umwandeln beim Veschicken von Dateien"
+msgstr "warte beim Veschicken von Dateien nicht auf das ACK-Signal"
#: src/common/weeconfig.c:835
msgid "allowed ports for outgoing dcc"
@@ -5783,18 +5599,146 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Konfiguration wird gespeichert\n"
-#~ msgid "Kb"
-#~ msgstr "KB"
+#~ msgid "sets ban on"
+#~ msgstr "verbannt"
-#~ msgid "Mb"
-#~ msgstr "MB"
+#~ msgid "removes ban on"
+#~ msgstr "entbannt"
-#~ msgid "Gb"
-#~ msgstr "GB"
+#~ msgid "sets realname ban on"
+#~ msgstr "setzt Realnamenbann für"
-#~ msgid ""
-#~ "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize"
-#~ "\" option, max is %d.\n"
-#~ msgstr ""
-#~ "%s DCC schlug aufgrund zu großer Blockgröße fehl. Bitte überprüfen Sie "
-#~ "den Wert der \"dcc_blocksize\"-Option, das Maximum beträgt %d.\n"
+#~ msgid "removes realname ban on"
+#~ msgstr "entfernt Realnamenbann von"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "setzt Bann-Ausnahme für"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "entfernt Bann-Ausnahme für"
+
+#~ msgid "sets mode +f"
+#~ msgstr "setzt Channelmodus +f (forward on uninvited)"
+
+#~ msgid "removes mode +f"
+#~ msgstr "entfernt Channelmodus +f (forward on uninvited)"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "verleiht Halboperatorstatus an"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "entfernt den Halboperatorstatus von"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "setzt das Flag \"Zutritt nur mit Einladung\""
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "entfernt das Flag \"Zutritt nur mit Einladung\""
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "setzt Ausnahme für \"Zutritt nur mit Einladung\""
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "entfernt Ausnahme für \"Zutritt nur mit Einladung\""
+
+#~ msgid "sets channel key to"
+#~ msgstr "setzt den Channelkey auf"
+
+#~ msgid "removes channel key"
+#~ msgstr "entfernt den Channelkey"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "setzt das Userlimit auf"
+
+#~ msgid "removes user limit"
+#~ msgstr "entfernt das Userlimit"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "setzt den Channel auf moderiert"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "entfernt das moderiert-Flag"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "blockiert Nachrichten von außen"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "erlaubt Nachrichten von außen"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "verleiht Operatorstatus an"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "aberkennt den Operatorstatus von"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "setzt das privat-Flag"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "entfernt das privat-Flag"
+
+#~ msgid "sets quiet on"
+#~ msgstr "setzt das quiet-Flag"
+
+#~ msgid "removes quiet on"
+#~ msgstr "entfernt das quiet-Flag"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "setzt das geheim-Flag"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "entfernt das geheim-Flag"
+
+#~ msgid "sets topic protection"
+#~ msgstr "sperrt das Topic"
+
+#~ msgid "removes topic protection"
+#~ msgstr "gibt das Topic frei"
+
+#~ msgid "gives voice to"
+#~ msgstr "vergibt Voice an"
+
+#~ msgid "removes voice from"
+#~ msgstr "entfernt Voice von"
+
+#~ msgid "sets away"
+#~ msgstr "aktiviert Abwesenheitsstatus"
+
+#~ msgid "removes away"
+#~ msgstr "deaktiviert Abwesenheitsstatus"
+
+#~ msgid "sets invisible"
+#~ msgstr "aktiviert Unsichtbarkeitsstatus"
+
+#~ msgid "removes invisible"
+#~ msgstr "deaktiviert Unsichtbarkeitsstatus"
+
+#~ msgid "sets wallops"
+#~ msgstr "aktiviert den Empfang von Wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "deaktiviert den Empfang von Wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "aktiviert die eingeschränkte Verbindung"
+
+#~ msgid "removes restricted"
+#~ msgstr "deaktiviert die eingeschränkte Verbindung"
+
+#~ msgid "sets operator"
+#~ msgstr "vergibt Operatorstatus"
+
+#~ msgid "removes operator"
+#~ msgstr "entfernt Operatorstatus"
+
+#~ msgid "sets local operator"
+#~ msgstr "vergibt lokalen Oeratorstatus"
+
+#~ msgid "removes local operator"
+#~ msgstr "entfernt lokalen Operatorstatus"
+
+#~ msgid "sets server notices"
+#~ msgstr "aktiviert Servernachrichten"
+
+#~ msgid "removes server notices"
+#~ msgstr "deaktiviert Servernachrichten"
diff --git a/weechat/po/es.po b/weechat/po/es.po
index e4bb71d0b..894e18a39 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-07-25 20:00+0200\n"
"Last-Translator: Roberto Gonzlez Cardenete \n"
"Language-Team: weechat-dev \n"
@@ -14,88 +14,88 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, 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:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s El comando \"%s\" ha fallado!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Ningn comando para ejecutar!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s el handshake gnutls ha fallado\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s direccin proxy \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s direccin \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s direccin proxy IP no encontrada\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s Direccin IP no encontrada\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s conexin proxy rechazada\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s conexin rechazada\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -104,12 +104,12 @@ msgstr ""
"%s el proxy ha fallado al establecer la conexin al servidor (comprueba el "
"nombre de usuario o la contrasea si es necesario)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, 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:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -117,57 +117,57 @@ msgstr ""
"%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
"con soporte GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s error de inicializacin de gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexin\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Desconectado del servidor!\n"
@@ -1362,7 +1362,7 @@ msgstr "inactivo"
msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no ser guardado)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "segundos"
@@ -1445,9 +1445,9 @@ msgstr "%s, compilado en %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1477,492 +1477,310 @@ msgstr "%s%s%s ha expulsado a %s%s%s del servidor"
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:685
-msgid "sets ban on"
-msgstr "poner baneo en"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "quita el baneo en"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "pone baneo de nombre real en"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "quita baneo de nombre real en"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "pone una exencin de baneo en"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "quita una exencin de baneo en"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "pone modo +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "quita modo +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "da estado de operador de medio canal a"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "quita el estado de operador de medio canal a"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "pone el canal en modo slo-por-invitacin"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "quita el indicador de canal slo-por-invitacin"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "pone una exencin de slo-por-invitacin en"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "quita una exencin de slo-por-invitacin en"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "pone clave de canal en"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "elimina la clave de canal"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "define el lmite de usuarios en"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "elimina el lmite de usuarios"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "establece la moderacin en el canal"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "elimina la moderacin en el canal"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "establece el modo slo mensajes de usuarios del canal"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "autoriza a todos los usuarios a escribir en el canal"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "dar estado de operador de canal a"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "eliminar el estado de operador de canal a"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "establece el canal como privado"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "elimina el modo privado para el canal"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "pone el modo silencio"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "quita el modo silencio"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "establece el canal como secreto"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "elimina el modo secreto para el canal"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "activa la proteccin de tema"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "elimina la proteccin de tema"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "da voz a"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "quita la voz a"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "pone ausente"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "quita ausente"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "pone invisible"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "quita invisible"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "pone wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "quita wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "pone restringido"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "quita restringido"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "pone operador"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "quita operador"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "pone operador local"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "quita operador local"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "pone notificaciones del servidor"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "quita notificaciones del servidor"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, 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:1354
+#: src/irc/irc-recv.c:702
+#, 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:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Usted es conocido ahora como %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s es conocido ahora como %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s respuesta de %s%s%s: %ld.%ld segundos\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Privado"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s comando \"%s\" recibido sin host o canal\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s ha abandonado %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Canal"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Recibido un CTCP %sSOUND%s \"%s\" de %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s recibido de %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "CTCP desconocido %s%s%s recibido de %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s recibido de %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, 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:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est ausente: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactividad: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "das"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "da"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Sin tema establecido para %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "El tema para %s%s%s es: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Tema establecido por %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Usuarios %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, 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:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1971,14 +1789,14 @@ msgstr ""
"%s: todos los nombres de usuario declarados ya estn en uso, cerrando la "
"conexin con el servidor!\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "desconocido"
@@ -2417,27 +2235,27 @@ msgstr ""
msgid "ETA"
msgstr "Tiempo estimado de llegada"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Aceptar"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Cancelar"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Eliminar"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Cerrar vista de datos basura"
@@ -2459,28 +2277,28 @@ msgstr ""
msgid "(away)"
msgstr "(ausente)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[no conectado] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "RAW_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-MS-"
@@ -2488,7 +2306,7 @@ msgstr "-M
msgid "server"
msgstr "servidor"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "No hay suficiente memoria para una nueva lnea\n"
@@ -5817,6 +5635,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Guardar configuracin a disco\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "pone ausente"
+
+#~ msgid "removes away"
+#~ msgstr "quita ausente"
+
+#~ msgid "sets invisible"
+#~ msgstr "pone invisible"
+
+#~ msgid "removes invisible"
+#~ msgstr "quita invisible"
+
+#~ msgid "sets wallops"
+#~ msgstr "pone wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "quita wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "pone restringido"
+
+#~ msgid "removes restricted"
+#~ msgstr "quita restringido"
+
+#~ msgid "sets operator"
+#~ msgstr "pone operador"
+
+#~ msgid "removes operator"
+#~ msgstr "quita operador"
+
+#~ msgid "sets local operator"
+#~ msgstr "pone operador local"
+
+#~ msgid "removes local operator"
+#~ msgstr "quita operador local"
+
+#~ msgid "sets server notices"
+#~ msgstr "pone notificaciones del servidor"
+
+#~ msgid "removes server notices"
+#~ msgstr "quita notificaciones del servidor"
+
+#~ msgid "sets ban on"
+#~ msgstr "poner baneo en"
+
+#~ msgid "removes ban on"
+#~ msgstr "quita el baneo en"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "pone baneo de nombre real en"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "quita baneo de nombre real en"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "pone una exencin de baneo en"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "quita una exencin de baneo en"
+
+#~ msgid "sets mode +f"
+#~ msgstr "pone modo +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "quita modo +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "da estado de operador de medio canal a"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "quita el estado de operador de medio canal a"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "pone el canal en modo slo-por-invitacin"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "quita el indicador de canal slo-por-invitacin"
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "pone una exencin de slo-por-invitacin en"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "quita una exencin de slo-por-invitacin en"
+
+#~ msgid "sets channel key to"
+#~ msgstr "pone clave de canal en"
+
+#~ msgid "removes channel key"
+#~ msgstr "elimina la clave de canal"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "define el lmite de usuarios en"
+
+#~ msgid "removes user limit"
+#~ msgstr "elimina el lmite de usuarios"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "establece la moderacin en el canal"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "elimina la moderacin en el canal"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "establece el modo slo mensajes de usuarios del canal"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "autoriza a todos los usuarios a escribir en el canal"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "dar estado de operador de canal a"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "eliminar el estado de operador de canal a"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "establece el canal como privado"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "elimina el modo privado para el canal"
+
+#~ msgid "sets quiet on"
+#~ msgstr "pone el modo silencio"
+
+#~ msgid "removes quiet on"
+#~ msgstr "quita el modo silencio"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "establece el canal como secreto"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "elimina el modo secreto para el canal"
+
+#~ msgid "sets topic protection"
+#~ msgstr "activa la proteccin de tema"
+
+#~ msgid "removes topic protection"
+#~ msgstr "elimina la proteccin de tema"
+
+#~ msgid "gives voice to"
+#~ msgstr "da voz a"
+
+#~ msgid "removes voice from"
+#~ msgstr "quita la voz a"
+
#~ msgid "Kb"
#~ msgstr "KB"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 2587b35bb..740a32c88 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -6,96 +6,96 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
-"PO-Revision-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
+"PO-Revision-Date: 2006-08-07 00:24+0200\n"
"Last-Translator: FlashCode \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Impossible de dterminer le nom d'utilisateur"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s impossible d'allouer un nouveau serveur\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s erreur d'envoi de donnes au serveur IRC\n"
-#: src/irc/irc-server.c:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s mmoire insuffisante pour un message IRC reu\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s La commande \"%s\" a chou !\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Pas de commande excuter !\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s impossible de lire des donnes sur la socket, dconnexion du serveur...\n"
-#: src/irc/irc-server.c:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s le handshake gnutls a chou\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s adresse du proxy \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresse \"%s\" introuvable\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s adresse IP du proxy introuvable\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s adresse IP introuvable\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s connexion au proxy refuse\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s connexion refuse\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -104,12 +104,12 @@ msgstr ""
"%s le proxy n'a pas pu se connecter au serveur (vrifiez l'utilisateur/mot "
"de passe si utiliss)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s impossible de paramtrer le nom/IP local\n"
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -117,57 +117,57 @@ msgstr ""
"%s impossible de se connecter en SSL car WeeChat n'a pas t construit avec "
"le support GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de crer le pipe\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de crer la socket\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramtrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1662
+#: src/irc/irc-server.c:1660
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramtrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Dconnect du serveur !\n"
@@ -1356,7 +1356,7 @@ msgstr "d
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauv)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "secondes"
@@ -1441,9 +1441,9 @@ msgstr "%s, compil
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouv pour la commande \"%s\"\n"
@@ -1473,492 +1473,310 @@ msgstr "%s%s%s a tu
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:685
-msgid "sets ban on"
-msgstr "instaure un bannissement sur"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "supprime le banissement sur"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "instaure un bannissement sur le nom rel"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "supprime le banissement sur le nom rel"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "dfinit une exception de banissement sur"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "supprime l'exception de banissement sur"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "dfinit le mode +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "supprime le mode +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "donne le droit demi-oprateur "
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "supprime le droit demi-oprateur "
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "dfinit le canal en mode invit seulement"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "supprime le mode invit seulement pour le canal"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "dfinit une exception d'invitation sur"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "supprime l'exception d'invitation sur"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "dfinit la cl du canal "
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "supprime la cl du canal"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "dfinit la limite d'utilisateurs "
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "supprime la limite d'utilisateurs"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "instaure la modration sur le canal"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "supprime la modration sur le canal"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "interdit aux utilisateurs en dehors du canal d'y crire"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "autorise tout utilisateur crire sur le canal"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "donne le droit oprateur "
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "supprime le droit oprateur "
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "dfinit le canal comme priv"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "supprime le mode priv pour le canal"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "dfinit le mode muet sur"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "supprime le mode muet sur"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "dfinit le canal comme secret"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "supprime le mode secret pour le canal"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "active la protection du titre"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "supprime la protection du titre"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "donne la voix "
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "supprime la voix de"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "active l'absence"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "supprime l'absence"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "active l'invisibilit"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "supprime l'invisibilit"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "active wallops"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "supprime wallops"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "active la restriction"
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "supprime la restriction"
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "active l'oprateur"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "supprime l'oprateur"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "active l'oprateur local"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "supprime l'oprateur local"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "active les notices du serveur"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "supprime les notices du serveur"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reue sans host\n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s commande \"%s\" reue sans canal ou utilisateur\n"
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, 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:731
+#, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Mode utilisateur %s%s %s[%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Vous tes maintenant connu sous le nom %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s est maintenant connu sous le nom %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s utilisateur non trouv pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "CTCP %sVERSION%s rponse de %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "CTCP %sPING%s rponse de %s%s%s: %ld.%ld secondes\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de crer la fentre prive \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Priv"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s commande \"%s\" reue sans host ou canal\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s a quitt %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Canal"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "CTCP %sSOUND%s \"%s\" reu de %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "CTCP %sPING%s reu de %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "CTCP inconnu %s%s%s reu de %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "CTCP %sVERSION%s reu de %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s type de DCC CHAT inconnu reu de "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reue sans canal\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
+#: src/irc/irc-recv.c:2408
#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
-msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n"
+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:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s est absent: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s inactivit: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Pas de titre dfini pour %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Le titre pour %s%s%s est: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s impossible de dterminer le canal pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Titre dfini par %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
"%s impossible de dterminer le nom d'utilisateur pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, 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:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Utilisateurs %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s impossible de crer l'utilisateur \"%s\" pour le canal \"%s\"\n"
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 2me "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:5303
+#: src/irc/irc-recv.c:4767
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 3me "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1967,14 +1785,14 @@ msgstr ""
"%s: tous les noms d'utilisateurs dclars sont dj en cours d'utilisation, "
"fermeture de la connexion avec le serveur !\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est dj en cours d'utilisation, essai avec le 1er "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "inconnu"
@@ -2413,27 +2231,27 @@ msgstr "Go"
msgid "ETA"
msgstr "ETA"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Accepter"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Annuler"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Retirer"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Fermer la vue IRC brut"
@@ -2455,28 +2273,28 @@ msgstr ""
msgid "(away)"
msgstr "(absent)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[non connect] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "IRC_BRUT"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-PLUS-"
@@ -2484,7 +2302,7 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Pas assez de mmoire pour une nouvelle ligne !\n"
@@ -5811,6 +5629,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "active l'absence"
+
+#~ msgid "removes away"
+#~ msgstr "supprime l'absence"
+
+#~ msgid "sets invisible"
+#~ msgstr "active l'invisibilit"
+
+#~ msgid "removes invisible"
+#~ msgstr "supprime l'invisibilit"
+
+#~ msgid "sets wallops"
+#~ msgstr "active wallops"
+
+#~ msgid "removes wallops"
+#~ msgstr "supprime wallops"
+
+#~ msgid "sets restricted"
+#~ msgstr "active la restriction"
+
+#~ msgid "removes restricted"
+#~ msgstr "supprime la restriction"
+
+#~ msgid "sets operator"
+#~ msgstr "active l'oprateur"
+
+#~ msgid "removes operator"
+#~ msgstr "supprime l'oprateur"
+
+#~ msgid "sets local operator"
+#~ msgstr "active l'oprateur local"
+
+#~ msgid "removes local operator"
+#~ msgstr "supprime l'oprateur local"
+
+#~ msgid "sets server notices"
+#~ msgstr "active les notices du serveur"
+
+#~ msgid "removes server notices"
+#~ msgstr "supprime les notices du serveur"
+
+#~ msgid "sets ban on"
+#~ msgstr "instaure un bannissement sur"
+
+#~ msgid "removes ban on"
+#~ msgstr "supprime le banissement sur"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "instaure un bannissement sur le nom rel"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "supprime le banissement sur le nom rel"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "dfinit une exception de banissement sur"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "supprime l'exception de banissement sur"
+
+#~ msgid "sets mode +f"
+#~ msgstr "dfinit le mode +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "supprime le mode +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "donne le droit demi-oprateur "
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "supprime le droit demi-oprateur "
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "dfinit le canal en mode invit seulement"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "supprime le mode invit seulement pour le canal"
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "dfinit une exception d'invitation sur"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "supprime l'exception d'invitation sur"
+
+#~ msgid "sets channel key to"
+#~ msgstr "dfinit la cl du canal "
+
+#~ msgid "removes channel key"
+#~ msgstr "supprime la cl du canal"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "dfinit la limite d'utilisateurs "
+
+#~ msgid "removes user limit"
+#~ msgstr "supprime la limite d'utilisateurs"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "instaure la modration sur le canal"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "supprime la modration sur le canal"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "interdit aux utilisateurs en dehors du canal d'y crire"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "autorise tout utilisateur crire sur le canal"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "donne le droit oprateur "
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "supprime le droit oprateur "
+
+#~ msgid "sets private channel flag"
+#~ msgstr "dfinit le canal comme priv"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "supprime le mode priv pour le canal"
+
+#~ msgid "sets quiet on"
+#~ msgstr "dfinit le mode muet sur"
+
+#~ msgid "removes quiet on"
+#~ msgstr "supprime le mode muet sur"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "dfinit le canal comme secret"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "supprime le mode secret pour le canal"
+
+#~ msgid "sets topic protection"
+#~ msgstr "active la protection du titre"
+
+#~ msgid "removes topic protection"
+#~ msgstr "supprime la protection du titre"
+
+#~ msgid "gives voice to"
+#~ msgstr "donne la voix "
+
+#~ msgid "removes voice from"
+#~ msgstr "supprime la voix de"
+
#~ msgid "Kb"
#~ msgstr "Ko"
diff --git a/weechat/po/hu.po b/weechat/po/hu.po
index 84d5ce13a..0f09e65ef 100644
--- a/weechat/po/hu.po
+++ b/weechat/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-07-25 20:00+0200\n"
"Last-Translator: Andras Voroskoi \n"
"Language-Team: weechat-dev \n"
@@ -16,89 +16,89 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: KBabel 1.11.1\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "A felhasználónév meghatározása sikertelen"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s az új szerver lefoglalása sikertelen\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, 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:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, 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:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Parancs \"%s\" sikertelen!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s A futtatandó parancs nem található!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, 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:869
+#: src/irc/irc-server.c:867
#, 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:950
+#: src/irc/irc-server.c:948
#, 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:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s gnutls kézfogás sikertelen\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, 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:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s cím \"%s\" nem található\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, 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:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP-cím nem található\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, 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:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s a csatlakozás elutasítva\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -107,12 +107,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:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr ""
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -120,61 +120,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:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, 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:1592
+#: src/irc/irc-server.c:1590
#, 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:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s gnutls inicializációs hiba\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, 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:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s nem sikerült a csatornát létrehozni\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, 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:1662
+#: src/irc/irc-server.c:1660
#, 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:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Újracsatlakozás a szerverhez...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Lekapcsolódott a szerverről!\n"
@@ -1366,7 +1366,7 @@ msgstr "ki"
msgid " (temporary server, will not be saved)"
msgstr " (átmeneti szerver, nem lesz mentve)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "másodperc"
@@ -1447,9 +1447,9 @@ msgstr "%s, lefordítva: %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s a \"%s\" szoba nem található a \"%s\" parancshoz\n"
@@ -1479,510 +1479,317 @@ msgstr ""
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:685
-msgid "sets ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "bekapcsolja az +f módot"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "kikapcsolja az +f módot"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "féloperátori jogot ad a következő felhasználónak:"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "elveszi a féloperátori jogot a következő felhasználótól:"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "bekapcsolja a meghívásos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "kikapcsolja a meghívásos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "a szoba kulcsát a következőre változtatta:"
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "megszünteti a szoba kulcsát"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "kérésére a felhasználói limit:"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "megszünteti a felhasználói limitet"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "bekapcsolja a moderált szoba kapcsolót"
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "kikapcsolja a moderált szoba kapcsolót"
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "bekapcsolja az üzenet csak ebből a szobából kapcsolót"
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "kikapcsolja az üzenet csak ebből a szobából kapcsolót"
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "operátori jogot ad a következőnek:"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "elveszi az operátori jogot a következőktől:"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "bekapcsolja a privát szoba kapcsolót"
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "kikapcsolja a privát szoba kapcsolót"
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "bekapcsolja a csendes módot"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "kikapcsolja a csendes módot"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "bekapcsolja a titkos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "kikapcsolja a titkos szoba kapcsolót"
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "bekapcsolja a témavédelmet"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "kikapcsolja a témavédelmet"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "voice jogot biztosít a következőnek:"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "elveszi a voice jogot a következőtől:"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr ""
-
-#: src/irc/irc-recv.c:1139
-#, fuzzy
-msgid "removes away"
-msgstr "alias eltávolítása"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr ""
-
-#: src/irc/irc-recv.c:1150
-#, fuzzy
-msgid "removes invisible"
-msgstr "elveszi a voice jogot a következőtől:"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr ""
-
-#: src/irc/irc-recv.c:1161
-#, fuzzy
-msgid "removes wallops"
-msgstr "alias eltávolítása"
-
-#: src/irc/irc-recv.c:1171
-#, fuzzy
-msgid "sets restricted"
-msgstr "csatlakozás megtagadva!"
-
-#: src/irc/irc-recv.c:1172
-#, fuzzy
-msgid "removes restricted"
-msgstr "megszünteti a felhasználói limitet"
-
-#: src/irc/irc-recv.c:1182
-#, fuzzy
-msgid "sets operator"
-msgstr "whois (operátor)"
-
-#: src/irc/irc-recv.c:1183
-#, fuzzy
-msgid "removes operator"
-msgstr "elveszi a voice jogot a következőtől:"
-
-#: src/irc/irc-recv.c:1193
-#, fuzzy
-msgid "sets local operator"
-msgstr "ehhez szoba operátornak kell lennie"
-
-#: src/irc/irc-recv.c:1194
-#, fuzzy
-msgid "removes local operator"
-msgstr "elveszi az operátori jogot a következőktől:"
-
-#: src/irc/irc-recv.c:1204
-#, fuzzy
-msgid "sets server notices"
-msgstr "cél: szerver neve"
-
-#: src/irc/irc-recv.c:1205
-#, fuzzy
-msgid "removes server notices"
-msgstr "elveszi a voice jogot a felhasználó(k)tól"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, fuzzy, c-format
+msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
+msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Az új neved: %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s új neve: %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s nem található név a \"%s\" parancshoz\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr ""
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Privát"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s elhagyta a(z) %s%s szobát"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Szoba"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, c-format
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s távol: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Online felhasználók: "
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s tétlen: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "nap"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "nap"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "óra"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "óra"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "perc"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "perc"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "másodperc"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, 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:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "A %s%s%s szoba témája: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, 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:4163
+#: src/irc/irc-recv.c:3627
#, 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:4174
+#: src/irc/irc-recv.c:3638
#, 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:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, 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:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Felhasználók a %s%s%s szobában: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "név"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "név"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "operátor"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "operátor"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "féloperátor"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "normál"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, 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:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "ismeretlen"
@@ -2394,27 +2201,27 @@ msgstr ""
msgid "ETA"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Elfogadás"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Mégsem"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Eltávolítás"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Régi DCC törlése"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] DCC nézet bezárása"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Nyers adat nézet bezárása"
@@ -2436,28 +2243,28 @@ msgstr ""
msgid "(away)"
msgstr "(távol)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[nincs csatlakozva]"
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr " "
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Akt: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-TOVÁBB-"
@@ -2465,7 +2272,7 @@ msgstr "-TOVÁBB-"
msgid "server"
msgstr "szerver"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Nincs elég memória az új sorhoz\n"
@@ -5696,6 +5503,131 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Beállítások mentése a lemezre\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Felhasználói mód %s[%s%s%s/%s%s%s]\n"
+
+#, fuzzy
+#~ msgid "removes away"
+#~ msgstr "alias eltávolítása"
+
+#, fuzzy
+#~ msgid "removes invisible"
+#~ msgstr "elveszi a voice jogot a következőtől:"
+
+#, fuzzy
+#~ msgid "removes wallops"
+#~ msgstr "alias eltávolítása"
+
+#, fuzzy
+#~ msgid "sets restricted"
+#~ msgstr "csatlakozás megtagadva!"
+
+#, fuzzy
+#~ msgid "removes restricted"
+#~ msgstr "megszünteti a felhasználói limitet"
+
+#, fuzzy
+#~ msgid "sets operator"
+#~ msgstr "whois (operátor)"
+
+#, fuzzy
+#~ msgid "removes operator"
+#~ msgstr "elveszi a voice jogot a következőtől:"
+
+#, fuzzy
+#~ msgid "sets local operator"
+#~ msgstr "ehhez szoba operátornak kell lennie"
+
+#, fuzzy
+#~ msgid "removes local operator"
+#~ msgstr "elveszi az operátori jogot a következőktől:"
+
+#, fuzzy
+#~ msgid "sets server notices"
+#~ msgstr "cél: szerver neve"
+
+#, fuzzy
+#~ msgid "removes server notices"
+#~ msgstr "elveszi a voice jogot a felhasználó(k)tól"
+
+#~ msgid "sets mode +f"
+#~ msgstr "bekapcsolja az +f módot"
+
+#~ msgid "removes mode +f"
+#~ msgstr "kikapcsolja az +f módot"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "féloperátori jogot ad a következő felhasználónak:"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "elveszi a féloperátori jogot a következő felhasználótól:"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "bekapcsolja a meghívásos szoba kapcsolót"
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "kikapcsolja a meghívásos szoba kapcsolót"
+
+#~ msgid "sets channel key to"
+#~ msgstr "a szoba kulcsát a következőre változtatta:"
+
+#~ msgid "removes channel key"
+#~ msgstr "megszünteti a szoba kulcsát"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "kérésére a felhasználói limit:"
+
+#~ msgid "removes user limit"
+#~ msgstr "megszünteti a felhasználói limitet"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "bekapcsolja a moderált szoba kapcsolót"
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "kikapcsolja a moderált szoba kapcsolót"
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "bekapcsolja az üzenet csak ebből a szobából kapcsolót"
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "kikapcsolja az üzenet csak ebből a szobából kapcsolót"
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "operátori jogot ad a következőnek:"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "elveszi az operátori jogot a következőktől:"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "bekapcsolja a privát szoba kapcsolót"
+
+#~ msgid "removes private channel flag"
+#~ msgstr "kikapcsolja a privát szoba kapcsolót"
+
+#~ msgid "sets quiet on"
+#~ msgstr "bekapcsolja a csendes módot"
+
+#~ msgid "removes quiet on"
+#~ msgstr "kikapcsolja a csendes módot"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "bekapcsolja a titkos szoba kapcsolót"
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "kikapcsolja a titkos szoba kapcsolót"
+
+#~ msgid "sets topic protection"
+#~ msgstr "bekapcsolja a témavédelmet"
+
+#~ msgid "removes topic protection"
+#~ msgstr "kikapcsolja a témavédelmet"
+
+#~ msgid "gives voice to"
+#~ msgstr "voice jogot biztosít a következőnek:"
+
+#~ msgid "removes voice from"
+#~ msgstr "elveszi a voice jogot a következőtől:"
+
#~ msgid "Kb"
#~ msgstr "Kb"
diff --git a/weechat/po/ru.po b/weechat/po/ru.po
index 34ade2d22..9927c7731 100644
--- a/weechat/po/ru.po
+++ b/weechat/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.0-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: 2006-08-06 00:13+0300\n"
"Last-Translator: Stalwart \n"
"Language-Team: weechat-dev \n"
@@ -15,88 +15,88 @@ 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:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr "Не могу получить имя пользователя"
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s не могу расположить новый сервер\n"
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s ошибка при отправке данных IRC серверу\n"
-#: src/irc/irc-server.c:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s недостаточно памяти для полученного сообщения\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr "%s Команда \"%s\" не удалась!\n"
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Нет команд для запуска!\n"
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
"%s Неизвестная команда: команда=\"%s\", хост=\"%s\", аргументы=\"%s\"\n"
-#: src/irc/irc-server.c:869
+#: src/irc/irc-server.c:867
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr "%s невозможно прочитать данные из сокета, отключаюсь от сервера...\n"
-#: src/irc/irc-server.c:950
+#: src/irc/irc-server.c:948
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Повторное подключение к серверу через %d секунд\n"
-#: src/irc/irc-server.c:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s приветствие gnutls не удалось\n"
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr "%s proxy \"%s\" не найден\n"
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s адрес \"%s\" не найден\n"
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr "%s IP адрес proxy-сервера не найден\n"
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr "%s IP адрес не найден\n"
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr "%s в подключении к proxy-серверу отказано\n"
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr "%s в подключении отказано\n"
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
@@ -105,12 +105,12 @@ msgstr ""
"%s proxy-сервер не смог установить соединение с сервером (проверьте имя "
"пользователя и пароль если они используются)\n"
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr "%s не могу установить локальный хост/IP\n"
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
"%s невозможно соединиться с использованием SSL, так как WeeChat собран без "
"поддержки GNUtls\n"
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, 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:1578
+#: src/irc/irc-server.c:1576
#, 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:1588
+#: src/irc/irc-server.c:1586
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1592
+#: src/irc/irc-server.c:1590
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Подключаюсь к серверу %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s ошибка инициализации gnutls\n"
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s не могу создать pipe\n"
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s невозможно создать сокет\n"
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1662
+#: src/irc/irc-server.c:1660
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Повторное соединение...\n"
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr "Отключен от сервера!\n"
@@ -1349,7 +1349,7 @@ msgstr "выкл."
msgid " (temporary server, will not be saved)"
msgstr " (временный сервер, не будет сохранён)"
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr "секунды"
@@ -1431,9 +1431,9 @@ msgstr "%s, собран %s %s\n"
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:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s канал \"%s\" не найден для команды \"%s\"\n"
@@ -1463,499 +1463,317 @@ msgstr "%s%s%s убил %s%s%s"
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s хост \"%s\" не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:685
-msgid "sets ban on"
-msgstr "установил бан на"
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr "снял бан с"
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr "устанавливает бан по реальному имени на"
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr "снимает бан по реальному имени с"
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr "устанавливает исключение бана на"
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr "снимает бан с"
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr "установил режим +f"
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr "снял режим +f"
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr "дал привилегии полу-оператора канала"
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr "снял привилегии полу-оператора канала с"
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr "установил флаг канала \"только по приглашению\""
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr "снял флаг канала \"только по приглашению\""
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr "устанавливает режим \"только по приглашению\" на"
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr "снимает режим \"только по приглашению\" с"
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr "установил ключ канала: "
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr "убрал ключ канала"
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr "установил лимит пользователей в"
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr "снял лимит пользователей"
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr "установил флаг канала \"модерируемый\""
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr "снял флаг канал \"модерируемый\""
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr "установил флаг канала \"только сообщения с канала\""
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr "снял флаг канала \"только сообщения с канала\""
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr "дал привилегии оператора канала"
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr "снял привилегии оператора канала с"
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr "установил флаг канала \"личный\""
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr "снял флаг канала \"личный\""
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr "приглушил"
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr "снял приглушение"
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr "установил флаг канала \"тайный\""
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr "снял флаг канала \"тайный\""
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr "установил защиту темы канала"
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr "снял защиту темы канала"
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr "дал право голоса"
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr "убрал право голоса у"
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr "устанавливает отсутствие"
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr "снимает отсутствие"
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr "устанавливает невидимость"
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr "снимает невидимость"
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr "устанавливает wallopы"
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr "снимает wallopы"
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr "устанавливает флаг \"ограниченный\""
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr "снимает флаг \"ограниченный\""
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr "устанавливает оператор"
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr "снимает оператор"
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr "устанавливает локальный оператор"
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr "снимает локальный оператор"
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr "устанавливает уведомления сервера"
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr "снимает уведомления сервера"
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s \"%s\" команда получена без хоста\n"
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr "%s \"%s\" команда получена без канала или ника\n"
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, 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 был %s\n"
+
+#: src/irc/irc-recv.c:731
+#, fuzzy, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr "Режим пользователя %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr "Теперь вы известны как %s%s\n"
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr "%s%s%s теперь известен как %s%s\n"
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr "%s ник не найден для команды \"%s\"\n"
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr "Ответ на CTCP %sVERSION%s от %s%s%s: %s\n"
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr "Ответ на %sPING%s от %s%s%s: %ld.%ld секунд\n"
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s не могу создать новое окно привата \"%s\"\n"
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr "Приват"
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr "%s \"%s\" команда получена без хоста или канала\n"
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr "%s%s %s(%s%s%s)%s покинул %s%s"
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr "Канал"
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr "Получен CTCP %sSOUND%s \"%s\" от %s%s\n"
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr "Получен CTCP %sPING%s от %s%s\n"
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr "Получен CTCP %sVERSION%s от %s%s"
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s не могу проанализировать команду \"%s\"\n"
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s неизвестный режим DCC CHAT получен от "
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, 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:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s \"%s\" команда получена без канала\n"
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, 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:2829
+#: src/irc/irc-recv.c:2276
#, 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:2960
-#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#: src/irc/irc-recv.c:2408
+#, fuzzy, 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:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr "%s%s%s отсутствует: %s\n"
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr "Пользователей в сети:"
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, 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:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr "%s[%s%s%s]%s бездействует: "
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr "дней"
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr "день"
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr "часов"
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr "час"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr "минут"
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr "минута"
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr "секунда"
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr "Не установлена тема канала для %s%s\n"
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr "Тема канала %s%s%s: "
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s не могу опознать канал для команды \"%s\"\n"
-#: src/irc/irc-recv.c:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr "Тема установлена пользователем %s%s%s, %s"
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s не могу опознать дату/время для команды \"%s\"\n"
-#: src/irc/irc-recv.c:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr "%s не могу опознать ник для команды \"%s\"\n"
-#: src/irc/irc-recv.c:4288
+#: src/irc/irc-recv.c:3752
#, 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:4348
+#: src/irc/irc-recv.c:3812
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr "Реоп канала %s%s%s: %s%s\n"
-#: src/irc/irc-recv.c:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr "Ники %s%s%s: %s["
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s не могу создать ник \"%s\" для канала \"%s\"\n"
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr "ники"
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr "ник"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr "опы"
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr "оп"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr "полуопы"
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr "полуоп"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr "войсы"
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr "войс"
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr "обычные"
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, 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:5156
+#: src/irc/irc-recv.c:4620
#, 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:5291
+#: src/irc/irc-recv.c:4755
#, 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:5303
+#: src/irc/irc-recv.c:4767
#, 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:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr "%s: все предложеные ники заняты, отключаюсь от сервера!\n"
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, 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:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr "неизвестный"
@@ -2378,27 +2196,27 @@ msgstr "ГБ"
msgid "ETA"
msgstr "осталось"
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr " [A] Принять"
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr " [C] Отменить"
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr " [R] Удалить"
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr " [P] Очистить список"
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr " [Q] Закрыть окно"
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr " [Q] Закрыть окно сырых данных"
@@ -2420,28 +2238,28 @@ msgstr "<серверы>"
msgid "(away)"
msgstr "(отсутствует)"
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr "[не соединён] "
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr "Активны: "
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr "RAW_IRC"
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr "Задержка: %.1f"
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr "-ДАЛЬШЕ-"
@@ -2449,7 +2267,7 @@ msgstr "-ДАЛЬШЕ-"
msgid "server"
msgstr "сервер"
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr "Недостаточно памяти для новой строчки\n"
@@ -5728,6 +5546,153 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Сохраняю конфигурацию\n"
+#~ msgid "User mode %s[%s%s%s/%s%s%s]\n"
+#~ msgstr "Режим пользователя %s[%s%s%s/%s%s%s]\n"
+
+#~ msgid "sets away"
+#~ msgstr "устанавливает отсутствие"
+
+#~ msgid "removes away"
+#~ msgstr "снимает отсутствие"
+
+#~ msgid "sets invisible"
+#~ msgstr "устанавливает невидимость"
+
+#~ msgid "removes invisible"
+#~ msgstr "снимает невидимость"
+
+#~ msgid "sets wallops"
+#~ msgstr "устанавливает wallopы"
+
+#~ msgid "removes wallops"
+#~ msgstr "снимает wallopы"
+
+#~ msgid "sets restricted"
+#~ msgstr "устанавливает флаг \"ограниченный\""
+
+#~ msgid "removes restricted"
+#~ msgstr "снимает флаг \"ограниченный\""
+
+#~ msgid "sets operator"
+#~ msgstr "устанавливает оператор"
+
+#~ msgid "removes operator"
+#~ msgstr "снимает оператор"
+
+#~ msgid "sets local operator"
+#~ msgstr "устанавливает локальный оператор"
+
+#~ msgid "removes local operator"
+#~ msgstr "снимает локальный оператор"
+
+#~ msgid "sets server notices"
+#~ msgstr "устанавливает уведомления сервера"
+
+#~ msgid "removes server notices"
+#~ msgstr "снимает уведомления сервера"
+
+#~ msgid "sets ban on"
+#~ msgstr "установил бан на"
+
+#~ msgid "removes ban on"
+#~ msgstr "снял бан с"
+
+#~ msgid "sets realname ban on"
+#~ msgstr "устанавливает бан по реальному имени на"
+
+#~ msgid "removes realname ban on"
+#~ msgstr "снимает бан по реальному имени с"
+
+#~ msgid "sets ban exemption on"
+#~ msgstr "устанавливает исключение бана на"
+
+#~ msgid "removes ban exemption on"
+#~ msgstr "снимает бан с"
+
+#~ msgid "sets mode +f"
+#~ msgstr "установил режим +f"
+
+#~ msgid "removes mode +f"
+#~ msgstr "снял режим +f"
+
+#~ msgid "gives half channel operator status to"
+#~ msgstr "дал привилегии полу-оператора канала"
+
+#~ msgid "removes half channel operator status from"
+#~ msgstr "снял привилегии полу-оператора канала с"
+
+#~ msgid "sets invite-only channel flag"
+#~ msgstr "установил флаг канала \"только по приглашению\""
+
+#~ msgid "removes invite-only channel flag"
+#~ msgstr "снял флаг канала \"только по приглашению\""
+
+#~ msgid "sets invite-only exemption on"
+#~ msgstr "устанавливает режим \"только по приглашению\" на"
+
+#~ msgid "removes invite-only exemption on"
+#~ msgstr "снимает режим \"только по приглашению\" с"
+
+#~ msgid "sets channel key to"
+#~ msgstr "установил ключ канала: "
+
+#~ msgid "removes channel key"
+#~ msgstr "убрал ключ канала"
+
+#~ msgid "sets the user limit to"
+#~ msgstr "установил лимит пользователей в"
+
+#~ msgid "removes user limit"
+#~ msgstr "снял лимит пользователей"
+
+#~ msgid "sets moderated channel flag"
+#~ msgstr "установил флаг канала \"модерируемый\""
+
+#~ msgid "removes moderated channel flag"
+#~ msgstr "снял флаг канал \"модерируемый\""
+
+#~ msgid "sets messages from channel only flag"
+#~ msgstr "установил флаг канала \"только сообщения с канала\""
+
+#~ msgid "removes messages from channel only flag"
+#~ msgstr "снял флаг канала \"только сообщения с канала\""
+
+#~ msgid "gives channel operator status to"
+#~ msgstr "дал привилегии оператора канала"
+
+#~ msgid "removes channel operator status from"
+#~ msgstr "снял привилегии оператора канала с"
+
+#~ msgid "sets private channel flag"
+#~ msgstr "установил флаг канала \"личный\""
+
+#~ msgid "removes private channel flag"
+#~ msgstr "снял флаг канала \"личный\""
+
+#~ msgid "sets quiet on"
+#~ msgstr "приглушил"
+
+#~ msgid "removes quiet on"
+#~ msgstr "снял приглушение"
+
+#~ msgid "sets secret channel flag"
+#~ msgstr "установил флаг канала \"тайный\""
+
+#~ msgid "removes secret channel flag"
+#~ msgstr "снял флаг канала \"тайный\""
+
+#~ msgid "sets topic protection"
+#~ msgstr "установил защиту темы канала"
+
+#~ msgid "removes topic protection"
+#~ msgstr "снял защиту темы канала"
+
+#~ msgid "gives voice to"
+#~ msgstr "дал право голоса"
+
+#~ msgid "removes voice from"
+#~ msgstr "убрал право голоса у"
+
#~ msgid "Kb"
#~ msgstr "Kb"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index 669dbba9a..c8697269c 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-08-05 22:09+0200\n"
+"POT-Creation-Date: 2006-08-08 00:08+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -15,155 +15,155 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-server.c:192 src/common/weeconfig.c:2295
+#: src/irc/irc-server.c:190 src/common/weeconfig.c:2295
msgid "Unable to get user's name"
msgstr ""
-#: src/irc/irc-server.c:260
+#: src/irc/irc-server.c:258
#, c-format
msgid "%s cannot allocate new server\n"
msgstr ""
-#: src/irc/irc-server.c:593
+#: src/irc/irc-server.c:591
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr ""
-#: src/irc/irc-server.c:615 src/irc/irc-server.c:628 src/irc/irc-server.c:675
-#: src/irc/irc-server.c:688
+#: src/irc/irc-server.c:613 src/irc/irc-server.c:626 src/irc/irc-server.c:673
+#: src/irc/irc-server.c:686
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr ""
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:804
#, c-format
msgid "%s Command \"%s\" failed!\n"
msgstr ""
-#: src/irc/irc-server.c:812
+#: src/irc/irc-server.c:810
#, c-format
msgid "%s No command to execute!\n"
msgstr ""
-#: src/irc/irc-server.c:818
+#: src/irc/irc-server.c:816
#, c-format
msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
msgstr ""
-#: src/irc/irc-server.c:869
+#: src/irc/irc-server.c:867
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
-#: src/irc/irc-server.c:950
+#: src/irc/irc-server.c:948
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr ""
-#: src/irc/irc-server.c:984
+#: src/irc/irc-server.c:982
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:1001
+#: src/irc/irc-server.c:999
#, c-format
msgid "%s proxy address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1005
+#: src/irc/irc-server.c:1003
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:1015
+#: src/irc/irc-server.c:1013
#, c-format
msgid "%s proxy IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1018
+#: src/irc/irc-server.c:1016
#, c-format
msgid "%s IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:1027
+#: src/irc/irc-server.c:1025
#, c-format
msgid "%s proxy connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1030
+#: src/irc/irc-server.c:1028
#, c-format
msgid "%s connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:1038
+#: src/irc/irc-server.c:1036
#, c-format
msgid ""
"%s proxy fails to establish connection to server (check username/password if "
"used)\n"
msgstr ""
-#: src/irc/irc-server.c:1048
+#: src/irc/irc-server.c:1046
#, c-format
msgid "%s unable to set local hostname/IP\n"
msgstr ""
-#: src/irc/irc-server.c:1563
+#: src/irc/irc-server.c:1561
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:1572
+#: src/irc/irc-server.c:1570
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1578
+#: src/irc/irc-server.c:1576
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1588
+#: src/irc/irc-server.c:1586
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1592
+#: src/irc/irc-server.c:1590
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1610
+#: src/irc/irc-server.c:1608
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:1625
+#: src/irc/irc-server.c:1623
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:1640
+#: src/irc/irc-server.c:1638
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:1651
+#: src/irc/irc-server.c:1649
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:1662
+#: src/irc/irc-server.c:1660
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1693
+#: src/irc/irc-server.c:1691
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1744 src/irc/irc-server.c:1753
+#: src/irc/irc-server.c:1742 src/irc/irc-server.c:1751
msgid "Disconnected from server!\n"
msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
msgid " (temporary server, will not be saved)"
msgstr ""
-#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3641
+#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3089
msgid "seconds"
msgstr ""
@@ -1327,9 +1327,9 @@ msgstr ""
msgid "You have been invited to %s%s%s by %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:1283
-#: src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1976 src/irc/irc-recv.c:4023
-#: src/irc/irc-recv.c:4044
+#: src/irc/irc-recv.c:424 src/irc/irc-recv.c:522 src/irc/irc-recv.c:720
+#: src/irc/irc-recv.c:1143 src/irc/irc-recv.c:1423 src/irc/irc-recv.c:3487
+#: src/irc/irc-recv.c:3508
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
@@ -1359,498 +1359,316 @@ msgstr ""
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:685
-msgid "sets ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:686
-msgid "removes ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:711
-msgid "sets realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:712
-msgid "removes realname ban on"
-msgstr ""
-
-#: src/irc/irc-recv.c:737
-msgid "sets ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:738
-msgid "removes ban exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:763
-msgid "sets mode +f"
-msgstr ""
-
-#: src/irc/irc-recv.c:764
-msgid "removes mode +f"
-msgstr ""
-
-#: src/irc/irc-recv.c:789
-msgid "gives half channel operator status to"
-msgstr ""
-
-#: src/irc/irc-recv.c:790
-msgid "removes half channel operator status from"
-msgstr ""
-
-#: src/irc/irc-recv.c:818
-msgid "sets invite-only channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:819
-msgid "removes invite-only channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:837
-msgid "sets invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:838
-msgid "removes invite-only exemption on"
-msgstr ""
-
-#: src/irc/irc-recv.c:863
-msgid "sets channel key to"
-msgstr ""
-
-#: src/irc/irc-recv.c:864
-msgid "removes channel key"
-msgstr ""
-
-#: src/irc/irc-recv.c:896
-msgid "sets the user limit to"
-msgstr ""
-
-#: src/irc/irc-recv.c:897
-msgid "removes user limit"
-msgstr ""
-
-#: src/irc/irc-recv.c:923
-msgid "sets moderated channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:924
-msgid "removes moderated channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:935
-msgid "sets messages from channel only flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:936
-msgid "removes messages from channel only flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:954
-msgid "gives channel operator status to"
-msgstr ""
-
-#: src/irc/irc-recv.c:955
-msgid "removes channel operator status from"
-msgstr ""
-
-#: src/irc/irc-recv.c:983
-msgid "sets private channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:984
-msgid "removes private channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:1002
-msgid "sets quiet on"
-msgstr ""
-
-#: src/irc/irc-recv.c:1003
-msgid "removes quiet on"
-msgstr ""
-
-#: src/irc/irc-recv.c:1021
-msgid "sets secret channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:1022
-msgid "removes secret channel flag"
-msgstr ""
-
-#: src/irc/irc-recv.c:1033
-msgid "sets topic protection"
-msgstr ""
-
-#: src/irc/irc-recv.c:1034
-msgid "removes topic protection"
-msgstr ""
-
-#: src/irc/irc-recv.c:1052
-msgid "gives voice to"
-msgstr ""
-
-#: src/irc/irc-recv.c:1053
-msgid "removes voice from"
-msgstr ""
-
-#: src/irc/irc-recv.c:1138
-msgid "sets away"
-msgstr ""
-
-#: src/irc/irc-recv.c:1139
-msgid "removes away"
-msgstr ""
-
-#: src/irc/irc-recv.c:1149
-msgid "sets invisible"
-msgstr ""
-
-#: src/irc/irc-recv.c:1150
-msgid "removes invisible"
-msgstr ""
-
-#: src/irc/irc-recv.c:1160
-msgid "sets wallops"
-msgstr ""
-
-#: src/irc/irc-recv.c:1161
-msgid "removes wallops"
-msgstr ""
-
-#: src/irc/irc-recv.c:1171
-msgid "sets restricted"
-msgstr ""
-
-#: src/irc/irc-recv.c:1172
-msgid "removes restricted"
-msgstr ""
-
-#: src/irc/irc-recv.c:1182
-msgid "sets operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1183
-msgid "removes operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1193
-msgid "sets local operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1194
-msgid "removes local operator"
-msgstr ""
-
-#: src/irc/irc-recv.c:1204
-msgid "sets server notices"
-msgstr ""
-
-#: src/irc/irc-recv.c:1205
-msgid "removes server notices"
-msgstr ""
-
-#: src/irc/irc-recv.c:1241 src/irc/irc-recv.c:1315 src/irc/irc-recv.c:1775
-#: src/irc/irc-recv.c:2590
+#: src/irc/irc-recv.c:664 src/irc/irc-recv.c:762 src/irc/irc-recv.c:1222
+#: src/irc/irc-recv.c:2037
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:674
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:1354
+#: src/irc/irc-recv.c:702
+#, c-format
+msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:731
+#, c-format
+msgid "User mode %s%s %s[%s%s%s]\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:801
#, c-format
msgid "You are now known as %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1358
+#: src/irc/irc-recv.c:805
#, c-format
msgid "%s%s%s is now known as %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1426
+#: src/irc/irc-recv.c:873
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1440
+#: src/irc/irc-recv.c:887
#, c-format
msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1474
+#: src/irc/irc-recv.c:921
#, c-format
msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
msgstr ""
-#: src/irc/irc-recv.c:1497 src/irc/irc-recv.c:2403 src/irc/irc-recv.c:2515
+#: src/irc/irc-recv.c:944 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1962
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:1522 src/irc/irc-recv.c:2535
+#: src/irc/irc-recv.c:969 src/irc/irc-recv.c:1982
msgid "Private"
msgstr ""
-#: src/irc/irc-recv.c:1598
+#: src/irc/irc-recv.c:1045
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1626
+#: src/irc/irc-recv.c:1073
#, c-format
msgid "%s%s %s(%s%s%s)%s has left %s%s"
msgstr ""
-#: src/irc/irc-recv.c:1825 src/irc/irc-recv.c:1951 src/irc/irc-recv.c:2431
+#: src/irc/irc-recv.c:1272 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1878
msgid "Channel"
msgstr ""
-#: src/irc/irc-recv.c:1859
+#: src/irc/irc-recv.c:1306
#, c-format
msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1889 src/irc/irc-recv.c:2075
+#: src/irc/irc-recv.c:1336 src/irc/irc-recv.c:1522
#, c-format
msgid "CTCP %sPING%s received from %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:1918 src/irc/irc-recv.c:2482
+#: src/irc/irc-recv.c:1365 src/irc/irc-recv.c:1929
#, c-format
msgid "Unknown CTCP %s%s%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2031
+#: src/irc/irc-recv.c:1478
#, c-format
msgid "CTCP %sVERSION%s received from %s%s"
msgstr ""
-#: src/irc/irc-recv.c:2098 src/irc/irc-recv.c:2119 src/irc/irc-recv.c:2135
-#: src/irc/irc-recv.c:2151 src/irc/irc-recv.c:2182 src/irc/irc-recv.c:2203
-#: src/irc/irc-recv.c:2219 src/irc/irc-recv.c:2249 src/irc/irc-recv.c:2270
-#: src/irc/irc-recv.c:2286 src/irc/irc-recv.c:2316 src/irc/irc-recv.c:2337
-#: src/irc/irc-recv.c:2352 src/irc/irc-recv.c:2566 src/irc/irc-recv.c:2974
-#: src/irc/irc-recv.c:4428 src/irc/irc-recv.c:4443 src/irc/irc-recv.c:4458
-#: src/irc/irc-recv.c:4473 src/irc/irc-recv.c:4486 src/irc/irc-recv.c:4551
-#: src/irc/irc-recv.c:4565 src/irc/irc-recv.c:4811 src/irc/irc-recv.c:4929
-#: src/irc/irc-recv.c:5066 src/irc/irc-recv.c:5081 src/irc/irc-recv.c:5187
-#: src/irc/irc-recv.c:5201
+#: src/irc/irc-recv.c:1545 src/irc/irc-recv.c:1566 src/irc/irc-recv.c:1582
+#: src/irc/irc-recv.c:1598 src/irc/irc-recv.c:1629 src/irc/irc-recv.c:1650
+#: src/irc/irc-recv.c:1666 src/irc/irc-recv.c:1696 src/irc/irc-recv.c:1717
+#: src/irc/irc-recv.c:1733 src/irc/irc-recv.c:1763 src/irc/irc-recv.c:1784
+#: src/irc/irc-recv.c:1799 src/irc/irc-recv.c:2013 src/irc/irc-recv.c:2422
+#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:3922
+#: src/irc/irc-recv.c:3937 src/irc/irc-recv.c:3950 src/irc/irc-recv.c:4015
+#: src/irc/irc-recv.c:4029 src/irc/irc-recv.c:4275 src/irc/irc-recv.c:4393
+#: src/irc/irc-recv.c:4530 src/irc/irc-recv.c:4545 src/irc/irc-recv.c:4651
+#: src/irc/irc-recv.c:4665
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:1812
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:2614
+#: src/irc/irc-recv.c:2061
#, c-format
msgid "%s%s %s(%s%s%s)%s has quit"
msgstr ""
-#: src/irc/irc-recv.c:2789
+#: src/irc/irc-recv.c:2236
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2818
+#: src/irc/irc-recv.c:2265
#, c-format
msgid "%s%s%s has changed topic for %s%s%s to:"
msgstr ""
-#: src/irc/irc-recv.c:2829
+#: src/irc/irc-recv.c:2276
#, c-format
msgid "%s%s%s has unset topic for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:2960
+#: src/irc/irc-recv.c:2408
#, c-format
-msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgid "User mode for %s%s%s is %s[%s%s%s]\n"
msgstr ""
-#: src/irc/irc-recv.c:3024
+#: src/irc/irc-recv.c:2472
#, c-format
msgid "%s%s%s is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3116
+#: src/irc/irc-recv.c:2564
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:3492
+#: src/irc/irc-recv.c:2940
#, c-format
msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
msgstr ""
-#: src/irc/irc-recv.c:3613
+#: src/irc/irc-recv.c:3061
#, c-format
msgid "%s[%s%s%s]%s idle: "
msgstr ""
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:3625 src/common/command.c:4066 src/common/command.c:4084
+#: src/irc/irc-recv.c:3073 src/common/command.c:4066 src/common/command.c:4084
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:3629
+#: src/irc/irc-recv.c:3077
#, 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:3633
+#: src/irc/irc-recv.c:3081
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3081
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:3637
+#: src/irc/irc-recv.c:3085
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:3641
+#: src/irc/irc-recv.c:3089
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:4035
+#: src/irc/irc-recv.c:3499
#, c-format
msgid "No topic set for %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4095
+#: src/irc/irc-recv.c:3559
#, c-format
msgid "Topic for %s%s%s is: "
msgstr ""
-#: src/irc/irc-recv.c:4110 src/irc/irc-recv.c:4192 src/irc/irc-recv.c:4303
+#: src/irc/irc-recv.c:3574 src/irc/irc-recv.c:3656 src/irc/irc-recv.c:3767
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:4163
+#: src/irc/irc-recv.c:3627
#, c-format
msgid "Topic set by %s%s%s, %s"
msgstr ""
-#: src/irc/irc-recv.c:4174
+#: src/irc/irc-recv.c:3638
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:4183 src/irc/irc-recv.c:4312
+#: src/irc/irc-recv.c:3647 src/irc/irc-recv.c:3776
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:4288
+#: src/irc/irc-recv.c:3752
#, c-format
msgid "%s%s%s has invited %s%s%s on %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4348
+#: src/irc/irc-recv.c:3812
#, c-format
msgid "Channel reop %s%s%s: %s%s\n"
msgstr ""
-#: src/irc/irc-recv.c:4825 src/irc/irc-recv.c:4975
+#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439
#, c-format
msgid "Nicks %s%s%s: %s["
msgstr ""
-#: src/irc/irc-recv.c:4897
+#: src/irc/irc-recv.c:4361
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:4996
+#: src/irc/irc-recv.c:4460
#, 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:5004
+#: src/irc/irc-recv.c:4468
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:5004
+#: src/irc/irc-recv.c:4468
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:5009
+#: src/irc/irc-recv.c:4473
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:5013
+#: src/irc/irc-recv.c:4477
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:5017
+#: src/irc/irc-recv.c:4481
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:5021
+#: src/irc/irc-recv.c:4485
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:5121
+#: src/irc/irc-recv.c:4585
#, c-format
msgid "%s[%s%s%s] %s%s%s banned by "
msgstr ""
-#: src/irc/irc-recv.c:5156
+#: src/irc/irc-recv.c:4620
#, c-format
msgid "%s[%s%s%s] %s%s%s banned\n"
msgstr ""
-#: src/irc/irc-recv.c:5291
+#: src/irc/irc-recv.c:4755
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:5303
+#: src/irc/irc-recv.c:4767
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:5315
+#: src/irc/irc-recv.c:4779
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:5325
+#: src/irc/irc-recv.c:4789
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:5337
+#: src/irc/irc-recv.c:4801
msgid "unknown"
msgstr ""
@@ -2249,27 +2067,27 @@ msgstr ""
msgid "ETA"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:410
+#: src/gui/curses/gui-curses-input.c:390
msgid " [A] Accept"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:411 src/gui/curses/gui-curses-input.c:415
+#: src/gui/curses/gui-curses-input.c:391 src/gui/curses/gui-curses-input.c:395
msgid " [C] Cancel"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:420
+#: src/gui/curses/gui-curses-input.c:400
msgid " [R] Remove"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:424
+#: src/gui/curses/gui-curses-input.c:404
msgid " [P] Purge old DCC"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:425
+#: src/gui/curses/gui-curses-input.c:405
msgid " [Q] Close DCC view"
msgstr ""
-#: src/gui/curses/gui-curses-input.c:432
+#: src/gui/curses/gui-curses-input.c:412
msgid " [Q] Close raw data view"
msgstr ""
@@ -2291,28 +2109,28 @@ msgstr ""
msgid "(away)"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:232
+#: src/gui/curses/gui-curses-status.c:214
msgid "[not connected] "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:238
+#: src/gui/curses/gui-curses-status.c:220
msgid " "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:250
+#: src/gui/curses/gui-curses-status.c:232
msgid "Act: "
msgstr ""
-#: src/gui/curses/gui-curses-status.c:331
+#: src/gui/curses/gui-curses-status.c:313
msgid "RAW_IRC"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:352
+#: src/gui/curses/gui-curses-status.c:334
#, c-format
msgid "Lag: %.1f"
msgstr ""
-#: src/gui/curses/gui-curses-status.c:368
+#: src/gui/curses/gui-curses-status.c:350
msgid "-MORE-"
msgstr ""
@@ -2320,7 +2138,7 @@ msgstr ""
msgid "server"
msgstr ""
-#: src/gui/gui-buffer.c:544
+#: src/gui/gui-buffer.c:545
msgid "Not enough memory for new line\n"
msgstr ""
diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c
index f61c9976c..868fade18 100644
--- a/weechat/src/common/completion.c
+++ b/weechat/src/common/completion.c
@@ -348,6 +348,19 @@ completion_list_add_key_cmd (t_completion *completion)
}
}
+/*
+ * completion_list_add_self_nick: add self nick on server to completion list
+ */
+
+void
+completion_list_add_self_nick (t_completion *completion)
+{
+ if (completion->server)
+ {
+ completion_list_add (completion, ((t_irc_server *)(completion->server))->nick);
+ }
+}
+
/*
* completion_list_add_channel_nicks: add channel nicks to completion list
*/
@@ -755,6 +768,9 @@ completion_build_list_template (t_completion *completion, char *template)
case 'k': /* key cmd/funtcions*/
completion_list_add_key_cmd (completion);
break;
+ case 'm': /* self nickname */
+ completion_list_add_self_nick (completion);
+ break;
case 'n': /* channel nicks */
completion_list_add_channel_nicks (completion);
break;
diff --git a/weechat/src/gui/curses/gui-curses-input.c b/weechat/src/gui/curses/gui-curses-input.c
index 72b7c816d..d173f6416 100644
--- a/weechat/src/gui/curses/gui-curses-input.c
+++ b/weechat/src/gui/curses/gui-curses-input.c
@@ -25,6 +25,7 @@
#endif
#include
+#include
#include "../../common/weechat.h"
#include "../gui.h"
@@ -73,8 +74,8 @@ gui_input_set_color (t_gui_window *window, int irc_color)
int
gui_input_get_prompt_length (t_gui_window *window, char *nick)
{
- char *pos, saved_char, *modes;
- int char_size, length, mode_found;
+ char *pos, saved_char;
+ int char_size, length;
length = 0;
pos = cfg_look_input_format;
@@ -99,18 +100,9 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
case 'm':
if (SERVER(window->buffer))
{
- mode_found = 0;
- for (modes = SERVER(window->buffer)->nick_modes;
- modes && modes[0]; modes++)
- {
- if (modes[0] != ' ')
- {
- length++;
- mode_found = 1;
- }
- }
- if (mode_found)
- length++;
+ if (SERVER(window->buffer)->nick_modes
+ && SERVER(window->buffer)->nick_modes[0])
+ length += strlen (SERVER(window->buffer)->nick_modes);
}
pos++;
break;
@@ -155,8 +147,8 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
void
gui_input_draw_prompt (t_gui_window *window, char *nick)
{
- char *pos, saved_char, *modes;
- int char_size, mode_found;
+ char *pos, saved_char;
+ int char_size;
wmove (GUI_CURSES(window)->win_input, 0, 0);
pos = cfg_look_input_format;
@@ -191,25 +183,13 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
case 'm':
if (SERVER(window->buffer))
{
- mode_found = 0;
- for (modes = SERVER(window->buffer)->nick_modes;
- modes && modes[0]; modes++)
- {
- if (modes[0] != ' ')
- mode_found = 1;
- }
- if (mode_found)
+ if (SERVER(window->buffer)->nick_modes
+ && SERVER(window->buffer)->nick_modes[0])
{
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT);
- wprintw (GUI_CURSES(window)->win_input, "+");
- for (modes = SERVER(window->buffer)->nick_modes;
- modes && modes[0]; modes++)
- {
- if (modes[0] != ' ')
- wprintw (GUI_CURSES(window)->win_input, "%c",
- modes[0]);
- }
+ wprintw (GUI_CURSES(window)->win_input, "%s",
+ SERVER(window->buffer)->nick_modes);
}
}
pos++;
diff --git a/weechat/src/gui/curses/gui-curses-status.c b/weechat/src/gui/curses/gui-curses-status.c
index 3d7317c9a..ad77dfcd9 100644
--- a/weechat/src/gui/curses/gui-curses-status.c
+++ b/weechat/src/gui/curses/gui-curses-status.c
@@ -44,7 +44,7 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
t_gui_window *ptr_win;
t_weechat_hotlist *ptr_hotlist;
char format[32], str_nicks[32], *more;
- int i, first_mode, x, server_pos, server_total;
+ int x, server_pos, server_total;
int display_name, names_count;
/* make gcc happy */
@@ -171,28 +171,10 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
wprintw (GUI_CURSES(ptr_win)->win_status, "(");
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
COLOR_WIN_STATUS);
- i = 0;
- first_mode = 1;
- while (CHANNEL(ptr_win->buffer)->modes[i])
- {
- if (CHANNEL(ptr_win->buffer)->modes[i] != ' ')
- {
- if (first_mode)
- {
- wprintw (GUI_CURSES(ptr_win)->win_status, "+");
- first_mode = 0;
- }
- wprintw (GUI_CURSES(ptr_win)->win_status, "%c",
- CHANNEL(ptr_win->buffer)->modes[i]);
- }
- i++;
- }
- if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_KEY] != ' ')
- wprintw (GUI_CURSES(ptr_win)->win_status, ",%s",
- CHANNEL(ptr_win->buffer)->key);
- if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_LIMIT] != ' ')
- wprintw (GUI_CURSES(ptr_win)->win_status, ",%d",
- CHANNEL(ptr_win->buffer)->limit);
+ if (CHANNEL(ptr_win->buffer)->modes
+ && (strcmp (CHANNEL(ptr_win->buffer)->modes, "+") != 0))
+ wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+ CHANNEL(ptr_win->buffer)->modes);
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
COLOR_WIN_STATUS_DELIMITERS);
wprintw (GUI_CURSES(ptr_win)->win_status, ")");
diff --git a/weechat/src/gui/gui-buffer.c b/weechat/src/gui/gui-buffer.c
index d946cdb43..e53379a04 100644
--- a/weechat/src/gui/gui-buffer.c
+++ b/weechat/src/gui/gui-buffer.c
@@ -99,6 +99,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
gui_buffers->all_servers = 1;
if (cfg_log_auto_server)
gui_log_start (gui_buffers);
+ gui_buffers->completion.server = server;
return gui_buffers;
}
diff --git a/weechat/src/irc/Makefile.am b/weechat/src/irc/Makefile.am
index 8853e80fb..7e7504ae0 100644
--- a/weechat/src/irc/Makefile.am
+++ b/weechat/src/irc/Makefile.am
@@ -26,6 +26,7 @@ lib_weechat_irc_a_SOURCES = irc.h \
irc-server.c \
irc-channel.c \
irc-nick.c \
+ irc-mode.c \
irc-dcc.c \
irc-ignore.c \
irc-display.c
diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c
index 25b481aa7..2b0fee6a6 100644
--- a/weechat/src/irc/irc-channel.c
+++ b/weechat/src/irc/irc-channel.c
@@ -61,9 +61,7 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name)
new_channel->dcc_chat = NULL;
new_channel->name = strdup (channel_name);
new_channel->topic = NULL;
- new_channel->modes = (char *) malloc (NUM_CHANNEL_MODES + 1);
- memset (new_channel->modes, ' ', NUM_CHANNEL_MODES);
- new_channel->modes[NUM_CHANNEL_MODES] = '\0';
+ new_channel->modes = NULL;
new_channel->limit = 0;
new_channel->key = NULL;
new_channel->nicks_count = 0;
@@ -127,6 +125,10 @@ channel_free (t_irc_server *server, t_irc_channel *channel)
free (channel->name);
if (channel->topic)
free (channel->topic);
+ if (channel->modes)
+ free (channel->modes);
+ if (channel->key)
+ free (channel->key);
nick_free_all (channel);
if (channel->away_message)
free (channel->away_message);
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index be153aafa..98e88b84c 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -156,7 +156,7 @@ t_irc_command irc_commands[] =
" s: mark a user for receive server notices\n"
" w: user receives wallops\n"
" o: operator flag"),
- "", 1, MAX_ARGS, 0, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
+ "%c|%m", 1, MAX_ARGS, 0, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
{ "motd", N_("get the \"Message Of The Day\""),
N_("[target]"),
N_("target: server name"),
diff --git a/weechat/src/irc/irc-mode.c b/weechat/src/irc/irc-mode.c
new file mode 100644
index 000000000..9336cb802
--- /dev/null
+++ b/weechat/src/irc/irc-mode.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2003-2006 by FlashCode
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* irc-mode.c: IRC channel/user modes management */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+#include
+
+#include "../common/weechat.h"
+#include "irc.h"
+#include "../common/command.h"
+#include "../gui/gui.h"
+
+
+/*
+ * irc_mode_channel_set_nick: set a mode for a nick on a channel
+ */
+
+void
+irc_mode_channel_set_nick (t_irc_channel *channel, char *nick,
+ char set_flag, int flag)
+{
+ t_irc_nick *ptr_nick;
+
+ if (nick)
+ {
+ ptr_nick = nick_search (channel, nick);
+ if (ptr_nick)
+ {
+ NICK_SET_FLAG(ptr_nick, (set_flag == '+'), flag);
+ nick_resort (channel, ptr_nick);
+ gui_nicklist_draw (channel->buffer, 1, 1);
+ }
+ }
+}
+
+/*
+ * irc_mode_channel_get_flag: search for flag before current position
+ */
+
+char
+irc_mode_channel_get_flag (char *str, char *pos)
+{
+ char set_flag;
+
+ set_flag = '+';
+ pos--;
+ while (pos >= str)
+ {
+ if (pos[0] == '-')
+ return '-';
+ if (pos[0] == '+')
+ return '+';
+ pos--;
+ }
+ return set_flag;
+}
+
+/*
+ * irc_mode_channel_set: set channel modes
+ */
+
+void
+irc_mode_channel_set (t_irc_channel *channel, char *modes)
+{
+ char *pos_args, set_flag, **argv, *pos, *ptr_arg;
+ int argc, current_arg;
+
+ argc = 0;
+ argv = NULL;
+ current_arg = 0;
+ pos_args = strchr (modes, ' ');
+ if (pos_args)
+ {
+ pos_args[0] = '\0';
+ pos_args++;
+ while (pos_args[0] == ' ')
+ pos_args++;
+ argv = explode_string (pos_args, " ", 0, &argc);
+ if (argc > 0)
+ current_arg = argc - 1;
+ }
+
+ if (modes && modes[0])
+ {
+ set_flag = '+';
+ pos = modes + strlen (modes) - 1;
+ while (pos >= modes)
+ {
+ switch (pos[0])
+ {
+ case ':':
+ case ' ':
+ case '+':
+ case '-':
+ break;
+ default:
+ set_flag = irc_mode_channel_get_flag (modes, pos);
+ ptr_arg = ((argc > 0) && (current_arg >= 0)) ?
+ argv[current_arg--] : NULL;
+ switch (pos[0])
+ {
+ case 'h':
+ irc_mode_channel_set_nick (channel, ptr_arg,
+ set_flag, NICK_HALFOP);
+ break;
+ case 'k':
+ if (channel->key)
+ {
+ free (channel->key);
+ channel->key = NULL;
+ }
+ if ((set_flag == '+') && ptr_arg)
+ channel->key = strdup (ptr_arg);
+ break;
+ case 'l':
+ if (set_flag == '-')
+ channel->limit = 0;
+ if ((set_flag == '+') && ptr_arg)
+ channel->limit = atoi (ptr_arg);
+ break;
+ case 'o':
+ irc_mode_channel_set_nick (channel, ptr_arg,
+ set_flag, NICK_OP);
+ break;
+ case 'v':
+ irc_mode_channel_set_nick (channel, ptr_arg,
+ set_flag, NICK_VOICE);
+ break;
+ }
+ break;
+ }
+ pos--;
+ }
+ }
+
+ if (argv)
+ free_exploded_string (argv);
+}
+
+/*
+ * irc_mode_user_add: add a user mode
+ */
+
+void
+irc_mode_user_add (t_irc_server *server, char mode)
+{
+ char str_mode[2];
+
+ str_mode[0] = mode;
+ str_mode[1] = '\0';
+
+ if (server->nick_modes)
+ {
+ if (!strchr (server->nick_modes, mode))
+ {
+ server->nick_modes = (char *) realloc (server->nick_modes,
+ strlen (server->nick_modes) + 1 + 1);
+ strcat (server->nick_modes, str_mode);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
+ }
+ }
+ else
+ {
+ server->nick_modes = (char *) malloc (2);
+ strcpy (server->nick_modes, str_mode);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
+ }
+}
+
+/*
+ * irc_mode_user_remove: remove a user mode
+ */
+
+void
+irc_mode_user_remove (t_irc_server *server, char mode)
+{
+ char *pos;
+ int new_size;
+
+ if (server->nick_modes)
+ {
+ pos = strchr (server->nick_modes, mode);
+ if (pos)
+ {
+ new_size = strlen (server->nick_modes);
+ memmove (pos, pos + 1, strlen (pos + 1) + 1);
+ server->nick_modes = (char *) realloc (server->nick_modes,
+ new_size);
+ gui_status_draw (gui_current_window->buffer, 1);
+ gui_input_draw (gui_current_window->buffer, 1);
+ }
+ }
+}
+
+/*
+ * irc_mode_user_set: set user modes
+ */
+
+void
+irc_mode_user_set (t_irc_server *server, char *modes)
+{
+ char set_flag;
+
+ set_flag = '+';
+ while (modes && modes[0])
+ {
+ switch (modes[0])
+ {
+ case ':':
+ case ' ':
+ break;
+ case '+':
+ set_flag = '+';
+ break;
+ case '-':
+ set_flag = '-';
+ break;
+ default:
+ if (set_flag == '+')
+ irc_mode_user_add (server, modes[0]);
+ else
+ irc_mode_user_remove (server, modes[0]);
+ break;
+ }
+ modes++;
+ }
+}
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index b9441d6a5..c2621897c 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -646,583 +646,6 @@ irc_cmd_recv_kill (t_irc_server *server, char *host, char *nick, char *arguments
return 0;
}
-/*
- * irc_get_channel_modes: get channel modes
- */
-
-void irc_get_channel_modes (t_irc_server *server, t_irc_channel *channel,
- char *channel_name,
- char *nick_host, char *modes, char *parm,
- int no_display)
-{
- char *pos, set_flag, unknown_mode[3];
- t_irc_nick *ptr_nick;
-
- set_flag = '+';
- while (modes && modes[0])
- {
- switch (modes[0])
- {
- case '+':
- set_flag = '+';
- break;
- case '-':
- set_flag = '-';
- break;
- case 'b':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "b", nick_host,
- (set_flag == '+') ?
- _("sets ban on") :
- _("removes ban on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'd':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "d", nick_host,
- (set_flag == '+') ?
- _("sets realname ban on") :
- _("removes realname ban on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'e':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "e", nick_host,
- (set_flag == '+') ?
- _("sets ban exemption on") :
- _("removes ban exemption on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'f':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "f", nick_host,
- (set_flag == '+') ?
- _("sets mode +f") :
- _("removes mode +f"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'h':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "h", nick_host,
- (set_flag == '+') ?
- _("gives half channel operator status to") :
- _("removes half channel operator status from"),
- (parm) ? parm : NULL);
- if (parm)
- {
- ptr_nick = nick_search (channel, parm);
- if (ptr_nick)
- {
- NICK_SET_FLAG(ptr_nick, (set_flag == '+'), NICK_HALFOP);
- nick_resort (channel, ptr_nick);
- gui_nicklist_draw (channel->buffer, 1, 1);
- }
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'i':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "i", nick_host,
- (set_flag == '+') ?
- _("sets invite-only channel flag") :
- _("removes invite-only channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_INVITE);
- break;
- case 'I':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "I", nick_host,
- (set_flag == '+') ?
- _("sets invite-only exemption on") :
- _("removes invite-only exemption on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'k':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "k", nick_host,
- (set_flag == '+') ?
- _("sets channel key to") :
- _("removes channel key"),
- (set_flag == '+') ?
- ((parm) ? parm : NULL) :
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_KEY);
- if (channel->key)
- free (channel->key);
- channel->key = strdup (parm);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'l':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "l", nick_host,
- (set_flag == '+') ?
- _("sets the user limit to") :
- _("removes user limit"),
- (set_flag == '+') ?
- ((parm) ? parm : NULL) :
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_LIMIT);
- if (set_flag == '-')
- channel->limit = 0;
- if ((set_flag == '+') && parm)
- channel->limit = atoi (parm);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'm':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "m", nick_host,
- (set_flag == '+') ?
- _("sets moderated channel flag") :
- _("removes moderated channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_MODERATED);
- break;
- case 'n':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "n", nick_host,
- (set_flag == '+') ?
- _("sets messages from channel only flag") :
- _("removes messages from channel only flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_NO_MSG_OUT);
- break;
- case 'o':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "o", nick_host,
- (set_flag == '+') ?
- _("gives channel operator status to") :
- _("removes channel operator status from"),
- (parm) ? parm : NULL);
- if (parm)
- {
- ptr_nick = nick_search (channel, parm);
- if (ptr_nick)
- {
- NICK_SET_FLAG(ptr_nick, (set_flag == '+'), NICK_OP);
- nick_resort (channel, ptr_nick);
- gui_nicklist_draw (channel->buffer, 1, 1);
- }
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 'p':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "p", nick_host,
- (set_flag == '+') ?
- _("sets private channel flag") :
- _("removes private channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_PRIVATE);
- break;
- case 'q':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "q", nick_host,
- (set_flag == '+') ?
- _("sets quiet on") :
- _("removes quiet on"),
- (parm) ? parm : NULL);
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- case 's':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "s", nick_host,
- (set_flag == '+') ?
- _("sets secret channel flag") :
- _("removes secret channel flag"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_SECRET);
- break;
- case 't':
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "t", nick_host,
- (set_flag == '+') ?
- _("sets topic protection") :
- _("removes topic protection"),
- NULL);
- CHANNEL_SET_MODE(channel, (set_flag == '+'),
- CHANNEL_MODE_TOPIC);
- break;
- case 'v':
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- "v", nick_host,
- (set_flag == '+') ?
- _("gives voice to") :
- _("removes voice from"),
- (parm) ? parm : NULL);
-
- if (parm)
- {
- ptr_nick = nick_search (channel, parm);
- if (ptr_nick)
- {
- NICK_SET_FLAG(ptr_nick, (set_flag == '+'), NICK_VOICE);
- nick_resort (channel, ptr_nick);
- gui_nicklist_draw (channel->buffer, 1, 1);
- }
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- default: /* unknown mode received */
- pos = NULL;
- if (parm)
- {
- pos = strchr (parm, ' ');
- if (pos)
- pos[0] = '\0';
- }
- if (nick_host && !no_display)
- {
- unknown_mode[0] = set_flag;
- unknown_mode[1] = modes[0];
- unknown_mode[2] = '\0';
- irc_display_mode (server, channel->buffer,
- channel_name, NULL, set_flag,
- unknown_mode + 1, nick_host,
- unknown_mode,
- (parm) ? parm : NULL);
- }
-
- /* look for next parameter */
- if (parm && pos)
- {
- pos++;
- while (pos[0] == ' ')
- pos++;
- parm = pos;
- }
- break;
- }
- modes++;
- }
-}
-
-/*
- * irc_get_nick_modes: get nick modes
- */
-
-void irc_get_nick_modes (t_irc_server *server,
- char *nick_host, char *modes, int no_display)
-{
- char set_flag, unknown_mode[3];
-
- set_flag = '+';
- while (modes && modes[0])
- {
- switch (modes[0])
- {
- case ':':
- break;
- case '+':
- set_flag = '+';
- break;
- case '-':
- set_flag = '-';
- break;
- case 'a':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "a", nick_host,
- (set_flag == '+') ?
- _("sets away") :
- _("removes away"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_AWAY);
- break;
- case 'i':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "i", nick_host,
- (set_flag == '+') ?
- _("sets invisible") :
- _("removes invisible"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_INVISIBLE);
- break;
- case 'w':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "w", nick_host,
- (set_flag == '+') ?
- _("sets wallops") :
- _("removes wallops"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_WALLOPS);
- break;
- case 'r':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "r", nick_host,
- (set_flag == '+') ?
- _("sets restricted") :
- _("removes restricted"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_RESTRICTED);
- break;
- case 'o':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "o", nick_host,
- (set_flag == '+') ?
- _("sets operator") :
- _("removes operator"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_OPERATOR);
- break;
- case 'O':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "O", nick_host,
- (set_flag == '+') ?
- _("sets local operator") :
- _("removes local operator"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_LOCAL_OPERATOR);
- break;
- case 's':
- if (nick_host && !no_display)
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- "s", nick_host,
- (set_flag == '+') ?
- _("sets server notices") :
- _("removes server notices"),
- NULL);
- NICK_SET_MODE(server, (set_flag == '+'), NICK_MODE_LOCAL_OPERATOR);
- break;
- default: /* unknown mode received */
- if (nick_host && !no_display)
- {
- unknown_mode[0] = set_flag;
- unknown_mode[1] = modes[0];
- unknown_mode[2] = '\0';
- irc_display_mode (server, server->buffer,
- NULL, server->nick, set_flag,
- unknown_mode + 1, nick_host,
- unknown_mode, NULL);
- }
- break;
- }
- modes++;
- }
-}
-
/*
* irc_cmd_recv_mode: 'mode' message received
*/
@@ -1230,7 +653,7 @@ void irc_get_nick_modes (t_irc_server *server,
int
irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_parm;
+ char *pos_modes, *pos;
t_irc_channel *ptr_channel;
/* no host => we can't identify sender of message! */
@@ -1243,8 +666,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
return -1;
}
- pos = strchr (arguments, ' ');
- if (!pos)
+ pos_modes = strchr (arguments, ' ');
+ if (!pos_modes)
{
irc_display_prefix (server, server->buffer, PREFIX_ERROR);
gui_printf_nolog (server->buffer,
@@ -1252,18 +675,19 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
WEECHAT_ERROR, "mode");
return -1;
}
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
+ pos_modes[0] = '\0';
+ pos_modes++;
+ while (pos_modes[0] == ' ')
+ pos_modes++;
+ if (pos_modes[0] == ':')
+ pos_modes++;
- pos_parm = strchr (pos, ' ');
- if (pos_parm)
+ /* remove spaces after modes */
+ pos = pos_modes + strlen (pos_modes) - 1;
+ while ((pos >= pos_modes) && (pos[0] == ' '))
{
- pos_parm[0] = '\0';
- pos_parm++;
- while (pos_parm[0] == ' ')
- pos_parm++;
+ pos[0] = '\0';
+ pos--;
}
if (string_is_channel (arguments))
@@ -1271,10 +695,23 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
ptr_channel = channel_search (server, arguments);
if (ptr_channel)
{
- irc_get_channel_modes (server, ptr_channel, arguments, nick,
- pos, pos_parm, command_ignored);
- gui_status_draw (ptr_channel->buffer, 1);
- gui_input_draw (ptr_channel->buffer, 1);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
+ gui_printf (ptr_channel->buffer,
+ _("Mode %s%s %s[%s%s%s]%s by %s%s\n"),
+ GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+ ptr_channel->name,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
+ pos_modes,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
+ GUI_COLOR(COLOR_WIN_CHAT_NICK),
+ nick);
+ }
+ irc_mode_channel_set (ptr_channel, pos_modes);
+ server_sendf (server, "MODE %s\r\n", ptr_channel->name);
}
else
{
@@ -1287,9 +724,19 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
}
else
{
- irc_get_nick_modes (server, nick, pos, command_ignored);
- gui_status_draw (gui_current_window->buffer, 1);
- gui_input_draw (gui_current_window->buffer, 1);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server, server->buffer, PREFIX_INFO);
+ gui_printf (server->buffer,
+ _("User mode %s%s %s[%s%s%s]\n"),
+ GUI_COLOR(COLOR_WIN_CHAT_NICK),
+ nick,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
+ pos_modes,
+ GUI_COLOR(COLOR_WIN_CHAT_DARK));
+ }
+ irc_mode_user_set (server, pos_modes);
}
return 0;
}
@@ -2957,12 +2404,13 @@ irc_cmd_recv_221 (t_irc_server *server, char *host, char *nick, char *arguments)
if (!command_ignored)
{
irc_display_prefix (server, server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, _("User mode %s[%s%s%s/%s%s%s]\n"),
- GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ gui_printf (server->buffer,
+ _("User mode for %s%s%s is %s[%s%s%s]\n"),
GUI_COLOR(COLOR_WIN_CHAT_NICK),
arguments,
GUI_COLOR(COLOR_WIN_CHAT),
- GUI_COLOR(COLOR_WIN_CHAT_NICK),
+ GUI_COLOR(COLOR_WIN_CHAT_DARK),
+ GUI_COLOR(COLOR_WIN_CHAT),
pos_mode,
GUI_COLOR(COLOR_WIN_CHAT_DARK));
}
@@ -3931,7 +3379,7 @@ irc_cmd_recv_323 (t_irc_server *server, char *host, char *nick, char *arguments)
int
irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos_channel, *pos, *pos_parm;
+ char *pos_channel, *pos_modes, *pos;
t_irc_channel *ptr_channel;
/* make gcc happy */
@@ -3946,28 +3394,44 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
while (pos_channel[0] == ' ')
pos_channel++;
- pos = strchr (pos_channel, ' ');
- if (pos)
+ pos_modes = strchr (pos_channel, ' ');
+ if (pos_modes)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
-
- pos_parm = strchr (pos, ' ');
- if (pos_parm)
+ pos_modes[0] = '\0';
+ pos_modes++;
+ while (pos_modes[0] == ' ')
+ pos_modes++;
+
+ /* remove spaces after modes */
+ pos = pos_modes + strlen (pos_modes) - 1;
+ while ((pos >= pos_modes) && (pos[0] == ' '))
{
- pos_parm[0] = '\0';
- pos_parm++;
- while (pos_parm[0] == ' ')
- pos_parm++;
+ pos[0] = '\0';
+ pos--;
}
+
+ /* search channel */
ptr_channel = channel_search (server, pos_channel);
if (ptr_channel)
{
- irc_get_channel_modes (server, ptr_channel, NULL, NULL,
- pos, pos_parm, command_ignored);
- gui_status_draw (ptr_channel->buffer, 0);
+ if (pos_modes[0])
+ {
+ if (ptr_channel->modes)
+ ptr_channel->modes = (char *) realloc (ptr_channel->modes,
+ strlen (pos_modes) + 1);
+ else
+ ptr_channel->modes = (char *) malloc (strlen (pos_modes) + 1);
+ strcpy (ptr_channel->modes, pos_modes);
+ }
+ else
+ {
+ if (ptr_channel->modes)
+ {
+ free (ptr_channel->modes);
+ ptr_channel->modes = NULL;
+ }
+ }
+ gui_status_draw (ptr_channel->buffer, 1);
}
}
}
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index ff3337868..498cdc09e 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -102,9 +102,7 @@ server_init (t_irc_server *server)
server->ssl_connected = 0;
server->unterminated_message = NULL;
server->nick = NULL;
- server->nick_modes = (char *) malloc (NUM_NICK_MODES + 1);
- memset (server->nick_modes, ' ', NUM_NICK_MODES);
- server->nick_modes[NUM_NICK_MODES] = '\0';
+ server->nick_modes = NULL;
server->reconnect_start = 0;
server->reconnect_join = 0;
server->is_away = 0;
@@ -1755,8 +1753,8 @@ server_disconnect (t_irc_server *server, int reconnect)
if (server->nick_modes)
{
- memset (server->nick_modes, ' ', NUM_NICK_MODES);
- server->nick_modes[NUM_NICK_MODES] = '\0';
+ free (server->nick_modes);
+ server->nick_modes = NULL;
}
server->is_away = 0;
server->away_time = 0;
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index 62b8364cb..3b130a89c 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -85,21 +85,6 @@ struct t_irc_nick
#define CHANNEL_TYPE_PRIVATE 1
#define CHANNEL_TYPE_DCC_CHAT 2
-#define NUM_CHANNEL_MODES 8
-#define CHANNEL_MODE_INVITE 0
-#define CHANNEL_MODE_KEY 1
-#define CHANNEL_MODE_LIMIT 2
-#define CHANNEL_MODE_MODERATED 3
-#define CHANNEL_MODE_NO_MSG_OUT 4
-#define CHANNEL_MODE_SECRET 5
-#define CHANNEL_MODE_TOPIC 6
-#define CHANNEL_MODE_PRIVATE 7
-#define CHANNEL_SET_MODE(channel, set, mode) \
- if (set) \
- channel->modes[mode] = channel_modes[mode]; \
- else \
- channel->modes[mode] = ' ';
-
typedef struct t_irc_channel t_irc_channel;
struct t_irc_channel
@@ -125,20 +110,6 @@ struct t_irc_channel
/* server types */
-#define NUM_NICK_MODES 7
-#define NICK_MODE_AWAY 0
-#define NICK_MODE_INVISIBLE 1
-#define NICK_MODE_WALLOPS 2
-#define NICK_MODE_RESTRICTED 3
-#define NICK_MODE_OPERATOR 4
-#define NICK_MODE_LOCAL_OPERATOR 5
-#define NICK_MODE_SERVER_NOTICES 6
-#define NICK_SET_MODE(server, set, mode) \
- if (set) \
- server->nick_modes[mode] = nick_modes[mode]; \
- else \
- server->nick_modes[mode] = ' ';
-
typedef struct t_irc_server t_irc_server;
struct t_irc_server
@@ -432,6 +403,11 @@ extern int nick_get_max_length (t_irc_channel *);
extern void nick_set_away (t_irc_channel *, t_irc_nick *, int);
extern void nick_print_log (t_irc_nick *);
+/* mode functions (irc-mode.c) */
+
+extern void irc_mode_channel_set (t_irc_channel *, char *);
+extern void irc_mode_user_set (t_irc_server *, char *);
+
/* DCC functions (irc-dcc.c) */
extern void dcc_redraw (int);
diff --git a/weechat/src/plugins/plugins-interface.c b/weechat/src/plugins/plugins-interface.c
index 16a49ebbb..28343746e 100644
--- a/weechat/src/plugins/plugins-interface.c
+++ b/weechat/src/plugins/plugins-interface.c
@@ -834,6 +834,7 @@ weechat_plugin_get_server_info (t_weechat_plugin *plugin)
new_server_info->is_connected = ptr_server->is_connected;
new_server_info->ssl_connected = ptr_server->ssl_connected;
new_server_info->nick = (ptr_server->nick) ? strdup (ptr_server->nick) : strdup ("");
+ new_server_info->nick_modes = (ptr_server->nick_modes) ? strdup (ptr_server->nick_modes) : strdup ("");
new_server_info->is_away = ptr_server->is_away;
new_server_info->away_time = ptr_server->away_time;
new_server_info->lag = ptr_server->lag;
diff --git a/weechat/src/plugins/scripts/lua/weechat-lua.c b/weechat/src/plugins/scripts/lua/weechat-lua.c
index 0398365bf..4d70d61f0 100644
--- a/weechat/src/plugins/scripts/lua/weechat-lua.c
+++ b/weechat/src/plugins/scripts/lua/weechat-lua.c
@@ -1371,6 +1371,10 @@ weechat_lua_get_server_info (lua_State *L)
lua_pushstring (lua_current_interpreter, "nick");
lua_pushstring (lua_current_interpreter, ptr_server->nick);
lua_rawset (lua_current_interpreter, -3);
+
+ lua_pushstring (lua_current_interpreter, "nick_modes");
+ lua_pushstring (lua_current_interpreter, ptr_server->nick_modes);
+ lua_rawset (lua_current_interpreter, -3);
lua_pushstring (lua_current_interpreter, "away_time");
lua_pushstring (lua_current_interpreter, timebuffer);
diff --git a/weechat/src/plugins/scripts/perl/weechat-perl.c b/weechat/src/plugins/scripts/perl/weechat-perl.c
index 52ac3e8a4..599d5754f 100644
--- a/weechat/src/plugins/scripts/perl/weechat-perl.c
+++ b/weechat/src/plugins/scripts/perl/weechat-perl.c
@@ -1163,6 +1163,7 @@ static XS (XS_weechat_get_server_info)
hv_store (server_hash_member, "is_connected", 12, newSViv (ptr_server->is_connected), 0);
hv_store (server_hash_member, "ssl_connected", 13, newSViv (ptr_server->ssl_connected), 0);
hv_store (server_hash_member, "nick", 4, newSVpv (ptr_server->nick, 0), 0);
+ hv_store (server_hash_member, "nick_modes", 10, newSVpv (ptr_server->nick_modes, 0), 0);
hv_store (server_hash_member, "away_time", 9, newSVpv (timebuffer, 0), 0);
hv_store (server_hash_member, "lag", 3, newSViv (ptr_server->lag), 0);
diff --git a/weechat/src/plugins/scripts/python/weechat-python.c b/weechat/src/plugins/scripts/python/weechat-python.c
index a54e6884f..7643a7088 100644
--- a/weechat/src/plugins/scripts/python/weechat-python.c
+++ b/weechat/src/plugins/scripts/python/weechat-python.c
@@ -1134,6 +1134,8 @@ weechat_python_get_server_info (PyObject *self, PyObject *args)
Py_BuildValue("i", ptr_server->ssl_connected));
PyDict_SetItem(server_hash_member, Py_BuildValue("s", "nick"),
Py_BuildValue("s", ptr_server->nick));
+ PyDict_SetItem(server_hash_member, Py_BuildValue("s", "nick_modes"),
+ Py_BuildValue("s", ptr_server->nick_modes));
PyDict_SetItem(server_hash_member, Py_BuildValue("s", "away_time"),
Py_BuildValue("s", timebuffer));
PyDict_SetItem(server_hash_member, Py_BuildValue("s", "lag"),
diff --git a/weechat/src/plugins/scripts/ruby/weechat-ruby.c b/weechat/src/plugins/scripts/ruby/weechat-ruby.c
index b813a5018..034847a37 100644
--- a/weechat/src/plugins/scripts/ruby/weechat-ruby.c
+++ b/weechat/src/plugins/scripts/ruby/weechat-ruby.c
@@ -1354,6 +1354,8 @@ weechat_ruby_get_server_info (VALUE class)
INT2FIX(ptr_server->ssl_connected));
rb_hash_aset (server_hash_member, rb_str_new2("nick"),
rb_str_new2(ptr_server->nick));
+ rb_hash_aset (server_hash_member, rb_str_new2("nick_modes"),
+ rb_str_new2(ptr_server->nick_modes));
rb_hash_aset (server_hash_member, rb_str_new2("away_time"),
rb_str_new2(timebuffer));
rb_hash_aset (server_hash_member, rb_str_new2("lag"),
diff --git a/weechat/src/plugins/weechat-plugin.h b/weechat/src/plugins/weechat-plugin.h
index 6c26ecedb..1f550fc87 100644
--- a/weechat/src/plugins/weechat-plugin.h
+++ b/weechat/src/plugins/weechat-plugin.h
@@ -107,6 +107,7 @@ struct t_plugin_server_info
int is_connected; /* 1 if WeeChat is connected to server */
int ssl_connected; /* = 1 if connected with SSL */
char *nick; /* current nickname */
+ char *nick_modes; /* nick modes */
int is_away; /* 1 is user is marker as away */
time_t away_time; /* time() when user marking as away */
int lag; /* lag (in milliseconds) */