diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2006-08-10 13:58:10 +0000 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2006-08-10 13:58:10 +0000 |
commit | 8c2876a77c6b0cbe471cf5153bd9c565335397d1 (patch) | |
tree | 86c639531eb89c79b95b3a4407b4459a041aac10 | |
parent | Fixed crash when purging DCC when a closed DCC chat has no more buffer (diff) | |
download | weechat-8c2876a77c6b0cbe471cf5153bd9c565335397d1.tar.xz weechat-8c2876a77c6b0cbe471cf5153bd9c565335397d1.zip |
Fixed command 348 (channel exception list, received by /mode #chan e)
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | po/cs.po | 59 | ||||
-rw-r--r-- | po/de.po | 59 | ||||
-rw-r--r-- | po/es.po | 59 | ||||
-rw-r--r-- | po/fr.po | 61 | ||||
-rw-r--r-- | po/hu.po | 59 | ||||
-rw-r--r-- | po/ru.po | 59 | ||||
-rw-r--r-- | po/weechat.pot | 59 | ||||
-rw-r--r-- | src/irc/irc-recv.c | 95 | ||||
-rw-r--r-- | weechat/ChangeLog | 3 | ||||
-rw-r--r-- | weechat/po/cs.po | 59 | ||||
-rw-r--r-- | weechat/po/de.po | 59 | ||||
-rw-r--r-- | weechat/po/es.po | 59 | ||||
-rw-r--r-- | weechat/po/fr.po | 61 | ||||
-rw-r--r-- | weechat/po/hu.po | 59 | ||||
-rw-r--r-- | weechat/po/ru.po | 59 | ||||
-rw-r--r-- | weechat/po/weechat.pot | 59 | ||||
-rw-r--r-- | weechat/src/irc/irc-recv.c | 95 |
18 files changed, 568 insertions, 458 deletions
@@ -1,9 +1,10 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-08-08 +ChangeLog - 2006-08-10 Version 0.2.0 (under dev!): + * fixed command 348 (channel exception list, received by /mode #chan e) * 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 @@ -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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-07-25 20:00+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1560,11 +1560,10 @@ msgstr "CTCP %sVERSION%s obdržen od %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s nemohu rozpársovat příkaz \"%s\"\n" @@ -1691,82 +1690,92 @@ msgstr "%s%s%s pozval %s%s%s na %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Reop kanálu %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s skončil" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Přezdívkz %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "přezdívky" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "přezdívka" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "částeční-ops" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "částečný-op" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normální" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1775,13 +1784,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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "neznámý" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-08-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-08-07 18:36+0200\n" "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n" "Language-Team: <de@li.org>\n" @@ -1560,11 +1560,10 @@ msgstr "CTCP %sVERSION%s von %s%s empfangen" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s kann den \"%s\"-Befehl nicht parsen\n" @@ -1692,82 +1691,92 @@ msgstr "%s%s%s hat %s%s%s in den Channel %s%s eingeladen\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Channel-Reop %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s hat das IRC verlassen" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Nicks %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "Nicks" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "Nick" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "Operatoren" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "Operator" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "Halb-Operatoren" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "Halb-Operator" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "Gevoicete" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "Gevoiceter" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1776,13 +1785,13 @@ msgstr "" "%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird " "getrennt!\n" -#: src/irc/irc-recv.c:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "unbekannt" @@ -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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-07-25 20:00+0200\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1571,11 +1571,10 @@ msgstr "CTCP %sVERSION%s recibido de %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s no es posible analizar el comando \"%s\"\n" @@ -1703,84 +1702,94 @@ msgstr "%s%s%s ha invitado a %s%s%s en %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "reop canal %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s ha salido" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Usuarios %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "usuarios" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "usuario" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "operadores" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "operador" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "semi-operadores" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "semi-operador" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "voces" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "voz" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1789,14 +1798,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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "desconocido" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.0-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-08-08 00:08+0200\n" -"PO-Revision-Date: 2006-08-07 00:24+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" +"PO-Revision-Date: 2006-08-10 15:49+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1567,11 +1567,10 @@ msgstr "CTCP %sVERSION%s reu de %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" @@ -1699,84 +1698,94 @@ msgstr "%s%s%s a invit %s%s%s sur %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Reop canal %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr " par %s%s %s(%s%s%s)" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr " par %s%s" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Utilisateurs %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1785,14 +1794,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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "inconnu" @@ -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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-07-25 20:00+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1573,11 +1573,10 @@ msgstr "" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n" @@ -1704,92 +1703,102 @@ msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s kilépett" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Felhasználók a %s%s%s szobában: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "név" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "név" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "operátor" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "operátor" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "féloperátor" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "féloperátor" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normál" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, 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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "ismeretlen" @@ -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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-08-06 00:13+0300\n" "Last-Translator: Stalwart <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1557,11 +1557,10 @@ msgstr "Получен CTCP %sVERSION%s от %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s не могу проанализировать команду \"%s\"\n" @@ -1688,92 +1687,102 @@ msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Реоп канала %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s вышел" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Ники %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s не могу создать ник \"%s\" для канала \"%s\"\n" -#: src/irc/irc-recv.c:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "ники" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "ник" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "опы" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "оп" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "полуопы" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "полуоп" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "войсы" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "войс" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "обычные" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "%s: все предложеные ники заняты, отключаюсь от сервера!\n" -#: src/irc/irc-recv.c:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "неизвестный" diff --git a/po/weechat.pot b/po/weechat.pot index c8697269c..9417bc7e0 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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1453,11 +1453,10 @@ msgstr "" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" @@ -1584,91 +1583,101 @@ msgstr "" msgid "Channel reop %s%s%s: %s%s\n" msgstr "" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, c-format msgid "%s[%s%s%s] %s%s%s banned by " msgstr "" -#: src/irc/irc-recv.c:4620 +#: src/irc/irc-recv.c:4611 #, c-format msgid "%s[%s%s%s] %s%s%s banned\n" msgstr "" -#: src/irc/irc-recv.c:4755 +#: src/irc/irc-recv.c:4746 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4767 +#: src/irc/irc-recv.c:4758 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "" -#: src/irc/irc-recv.c:4789 +#: src/irc/irc-recv.c:4780 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "" diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index c2621897c..a25b3696b 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -3915,42 +3915,25 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments) /* look for user who set exception */ pos_user = strchr (pos_exception, ' '); - if (!pos_user) + if (pos_user) { - irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf_nolog (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "348"); - return -1; - } - pos_user[0] = '\0'; - pos_user++; - while (pos_user[0] == ' ') + pos_user[0] = '\0'; pos_user++; - - /* look for date/time */ - pos_date = strchr (pos_user, ' '); - if (!pos_date) - { - irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf_nolog (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "348"); - return -1; - } - pos_date[0] = '\0'; - pos_date++; - while (pos_date[0] == ' ') - pos_date++; - - if (!pos_date || !pos_date[0]) - { - irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf_nolog (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "348"); - return -1; + while (pos_user[0] == ' ') + pos_user++; + + /* look for date/time */ + pos_date = strchr (pos_user, ' '); + if (pos_date) + { + pos_date[0] = '\0'; + pos_date++; + while (pos_date[0] == ' ') + pos_date++; + } } + else + pos_date = NULL; ptr_channel = channel_search (server, pos_channel); buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer; @@ -3960,7 +3943,7 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments) if (!command_ignored) { irc_display_prefix (server, buffer, PREFIX_INFO); - gui_printf (buffer, "%s[%s%s%s]%s exception %s%s%s by ", + gui_printf (buffer, "%s[%s%s%s]%s exception %s%s%s", GUI_COLOR(COLOR_WIN_CHAT_DARK), GUI_COLOR(COLOR_WIN_CHAT_CHANNEL), pos_channel, @@ -3969,27 +3952,35 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments) GUI_COLOR(COLOR_WIN_CHAT_HOST), pos_exception, GUI_COLOR(COLOR_WIN_CHAT)); - pos = strchr (pos_user, '!'); - if (pos) + if (pos_user) { - pos[0] = '\0'; - gui_printf (buffer, "%s%s %s(%s%s%s)", - GUI_COLOR(COLOR_WIN_CHAT_NICK), - pos_user, - GUI_COLOR(COLOR_WIN_CHAT_DARK), - GUI_COLOR(COLOR_WIN_CHAT_HOST), - pos + 1, - GUI_COLOR(COLOR_WIN_CHAT_DARK)); + pos = strchr (pos_user, '!'); + if (pos) + { + pos[0] = '\0'; + gui_printf (buffer, _(" by %s%s %s(%s%s%s)"), + GUI_COLOR(COLOR_WIN_CHAT_NICK), + pos_user, + GUI_COLOR(COLOR_WIN_CHAT_DARK), + GUI_COLOR(COLOR_WIN_CHAT_HOST), + pos + 1, + GUI_COLOR(COLOR_WIN_CHAT_DARK)); + } + else + gui_printf (buffer, _(" by %s%s"), + GUI_COLOR(COLOR_WIN_CHAT_NICK), + pos_user); + } + if (pos_date) + { + datetime = (time_t)(atol (pos_date)); + gui_printf_nolog (buffer, "%s, %s", + GUI_COLOR(COLOR_WIN_CHAT), + ctime (&datetime)); } else - gui_printf (buffer,"%s%s", - GUI_COLOR(COLOR_WIN_CHAT_NICK), - pos_user); - datetime = (time_t)(atol (pos_date)); - gui_printf_nolog (buffer, "%s, %s", - GUI_COLOR(COLOR_WIN_CHAT), - ctime (&datetime)); - } + gui_printf_nolog (buffer, "\n"); + } return 0; } diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 837da38fc..b9d4a62fe 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,9 +1,10 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-08-08 +ChangeLog - 2006-08-10 Version 0.2.0 (under dev!): + * fixed command 348 (channel exception list, received by /mode #chan e) * 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 diff --git a/weechat/po/cs.po b/weechat/po/cs.po index cf26ae34e..61bbb6fe0 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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-07-25 20:00+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1560,11 +1560,10 @@ msgstr "CTCP %sVERSION%s obdržen od %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s nemohu rozpársovat příkaz \"%s\"\n" @@ -1691,82 +1690,92 @@ msgstr "%s%s%s pozval %s%s%s na %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Reop kanálu %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s skončil" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Přezdívkz %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "přezdívky" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "přezdívka" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "částeční-ops" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "částečný-op" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normální" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1775,13 +1784,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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "neznámý" diff --git a/weechat/po/de.po b/weechat/po/de.po index 40337693f..f47a1fc89 100644 --- a/weechat/po/de.po +++ b/weechat/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-08-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-08-07 18:36+0200\n" "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n" "Language-Team: <de@li.org>\n" @@ -1560,11 +1560,10 @@ msgstr "CTCP %sVERSION%s von %s%s empfangen" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s kann den \"%s\"-Befehl nicht parsen\n" @@ -1692,82 +1691,92 @@ msgstr "%s%s%s hat %s%s%s in den Channel %s%s eingeladen\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Channel-Reop %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s hat das IRC verlassen" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Nicks %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "Nicks" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "Nick" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "Operatoren" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "Operator" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "Halb-Operatoren" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "Halb-Operator" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "Gevoicete" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "Gevoiceter" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1776,13 +1785,13 @@ msgstr "" "%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird " "getrennt!\n" -#: src/irc/irc-recv.c:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "unbekannt" diff --git a/weechat/po/es.po b/weechat/po/es.po index 894e18a39..ada1b7450 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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-07-25 20:00+0200\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1571,11 +1571,10 @@ msgstr "CTCP %sVERSION%s recibido de %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s no es posible analizar el comando \"%s\"\n" @@ -1703,84 +1702,94 @@ msgstr "%s%s%s ha invitado a %s%s%s en %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "reop canal %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s ha salido" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Usuarios %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "usuarios" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "usuario" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "operadores" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "operador" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "semi-operadores" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "semi-operador" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "voces" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "voz" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1789,14 +1798,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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "desconocido" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 740a32c88..785b8dfe5 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.0-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-08-08 00:08+0200\n" -"PO-Revision-Date: 2006-08-07 00:24+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" +"PO-Revision-Date: 2006-08-10 15:49+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1567,11 +1567,10 @@ msgstr "CTCP %sVERSION%s reu de %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" @@ -1699,84 +1698,94 @@ msgstr "%s%s%s a invit %s%s%s sur %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Reop canal %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr " par %s%s %s(%s%s%s)" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr " par %s%s" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Utilisateurs %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, 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:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1785,14 +1794,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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "inconnu" diff --git a/weechat/po/hu.po b/weechat/po/hu.po index 0f09e65ef..4f04f38ee 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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-07-25 20:00+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1573,11 +1573,10 @@ msgstr "" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n" @@ -1704,92 +1703,102 @@ msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s kilépett" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Felhasználók a %s%s%s szobában: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "név" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "név" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "operátor" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "operátor" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "féloperátor" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "féloperátor" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "normál" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, 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:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "ismeretlen" diff --git a/weechat/po/ru.po b/weechat/po/ru.po index 9927c7731..0a030253b 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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: 2006-08-06 00:13+0300\n" "Last-Translator: Stalwart <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1557,11 +1557,10 @@ msgstr "Получен CTCP %sVERSION%s от %s%s" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s не могу проанализировать команду \"%s\"\n" @@ -1688,92 +1687,102 @@ msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n" msgid "Channel reop %s%s%s: %s%s\n" msgstr "Реоп канала %s%s%s: %s%s\n" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, fuzzy, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "%s%s %s(%s%s%s)%s вышел" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Ники %s%s%s: %s[" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s не могу создать ник \"%s\" для канала \"%s\"\n" -#: src/irc/irc-recv.c:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "ники" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "ник" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "опы" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "оп" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "полуопы" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "полуоп" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "войсы" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "войс" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "обычные" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, 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:4620 +#: src/irc/irc-recv.c:4611 #, 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:4755 +#: src/irc/irc-recv.c:4746 #, 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:4767 +#: src/irc/irc-recv.c:4758 #, 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:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "%s: все предложеные ники заняты, отключаюсь от сервера!\n" -#: src/irc/irc-recv.c:4789 +#: src/irc/irc-recv.c:4780 #, 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:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "неизвестный" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index c8697269c..9417bc7e0 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-08 00:08+0200\n" +"POT-Creation-Date: 2006-08-10 15:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1453,11 +1453,10 @@ msgstr "" #: 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 +#: src/irc/irc-recv.c:3892 src/irc/irc-recv.c:3907 src/irc/irc-recv.c:4006 +#: src/irc/irc-recv.c:4020 src/irc/irc-recv.c:4266 src/irc/irc-recv.c:4384 +#: src/irc/irc-recv.c:4521 src/irc/irc-recv.c:4536 src/irc/irc-recv.c:4642 +#: src/irc/irc-recv.c:4656 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" @@ -1584,91 +1583,101 @@ msgstr "" msgid "Channel reop %s%s%s: %s%s\n" msgstr "" -#: src/irc/irc-recv.c:4289 src/irc/irc-recv.c:4439 +#: src/irc/irc-recv.c:3961 +#, c-format +msgid " by %s%s %s(%s%s%s)" +msgstr "" + +#: src/irc/irc-recv.c:3970 +#, c-format +msgid " by %s%s" +msgstr "" + +#: src/irc/irc-recv.c:4280 src/irc/irc-recv.c:4430 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "" -#: src/irc/irc-recv.c:4361 +#: src/irc/irc-recv.c:4352 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4460 +#: src/irc/irc-recv.c:4451 #, 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:4468 +#: src/irc/irc-recv.c:4459 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:4468 +#: src/irc/irc-recv.c:4459 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:4473 +#: src/irc/irc-recv.c:4464 msgid "op" msgstr "" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:4477 +#: src/irc/irc-recv.c:4468 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:4481 +#: src/irc/irc-recv.c:4472 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:4485 +#: src/irc/irc-recv.c:4476 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:4585 +#: src/irc/irc-recv.c:4576 #, c-format msgid "%s[%s%s%s] %s%s%s banned by " msgstr "" -#: src/irc/irc-recv.c:4620 +#: src/irc/irc-recv.c:4611 #, c-format msgid "%s[%s%s%s] %s%s%s banned\n" msgstr "" -#: src/irc/irc-recv.c:4755 +#: src/irc/irc-recv.c:4746 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4767 +#: src/irc/irc-recv.c:4758 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4779 +#: src/irc/irc-recv.c:4770 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "" -#: src/irc/irc-recv.c:4789 +#: src/irc/irc-recv.c:4780 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4801 +#: src/irc/irc-recv.c:4792 msgid "unknown" msgstr "" diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index c2621897c..a25b3696b 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -3915,42 +3915,25 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments) /* look for user who set exception */ pos_user = strchr (pos_exception, ' '); - if (!pos_user) + if (pos_user) { - irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf_nolog (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "348"); - return -1; - } - pos_user[0] = '\0'; - pos_user++; - while (pos_user[0] == ' ') + pos_user[0] = '\0'; pos_user++; - - /* look for date/time */ - pos_date = strchr (pos_user, ' '); - if (!pos_date) - { - irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf_nolog (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "348"); - return -1; - } - pos_date[0] = '\0'; - pos_date++; - while (pos_date[0] == ' ') - pos_date++; - - if (!pos_date || !pos_date[0]) - { - irc_display_prefix (server, server->buffer, PREFIX_ERROR); - gui_printf_nolog (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "348"); - return -1; + while (pos_user[0] == ' ') + pos_user++; + + /* look for date/time */ + pos_date = strchr (pos_user, ' '); + if (pos_date) + { + pos_date[0] = '\0'; + pos_date++; + while (pos_date[0] == ' ') + pos_date++; + } } + else + pos_date = NULL; ptr_channel = channel_search (server, pos_channel); buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer; @@ -3960,7 +3943,7 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments) if (!command_ignored) { irc_display_prefix (server, buffer, PREFIX_INFO); - gui_printf (buffer, "%s[%s%s%s]%s exception %s%s%s by ", + gui_printf (buffer, "%s[%s%s%s]%s exception %s%s%s", GUI_COLOR(COLOR_WIN_CHAT_DARK), GUI_COLOR(COLOR_WIN_CHAT_CHANNEL), pos_channel, @@ -3969,27 +3952,35 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments) GUI_COLOR(COLOR_WIN_CHAT_HOST), pos_exception, GUI_COLOR(COLOR_WIN_CHAT)); - pos = strchr (pos_user, '!'); - if (pos) + if (pos_user) { - pos[0] = '\0'; - gui_printf (buffer, "%s%s %s(%s%s%s)", - GUI_COLOR(COLOR_WIN_CHAT_NICK), - pos_user, - GUI_COLOR(COLOR_WIN_CHAT_DARK), - GUI_COLOR(COLOR_WIN_CHAT_HOST), - pos + 1, - GUI_COLOR(COLOR_WIN_CHAT_DARK)); + pos = strchr (pos_user, '!'); + if (pos) + { + pos[0] = '\0'; + gui_printf (buffer, _(" by %s%s %s(%s%s%s)"), + GUI_COLOR(COLOR_WIN_CHAT_NICK), + pos_user, + GUI_COLOR(COLOR_WIN_CHAT_DARK), + GUI_COLOR(COLOR_WIN_CHAT_HOST), + pos + 1, + GUI_COLOR(COLOR_WIN_CHAT_DARK)); + } + else + gui_printf (buffer, _(" by %s%s"), + GUI_COLOR(COLOR_WIN_CHAT_NICK), + pos_user); + } + if (pos_date) + { + datetime = (time_t)(atol (pos_date)); + gui_printf_nolog (buffer, "%s, %s", + GUI_COLOR(COLOR_WIN_CHAT), + ctime (&datetime)); } else - gui_printf (buffer,"%s%s", - GUI_COLOR(COLOR_WIN_CHAT_NICK), - pos_user); - datetime = (time_t)(atol (pos_date)); - gui_printf_nolog (buffer, "%s, %s", - GUI_COLOR(COLOR_WIN_CHAT), - ctime (&datetime)); - } + gui_printf_nolog (buffer, "\n"); + } return 0; } |