diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | po/cs.po | 171 | ||||
| -rw-r--r-- | po/es.po | 170 | ||||
| -rw-r--r-- | po/fr.po | 170 | ||||
| -rw-r--r-- | po/weechat.pot | 158 | ||||
| -rw-r--r-- | src/gui/gui-common.c | 67 | ||||
| -rw-r--r-- | src/gui/gui.h | 1 | ||||
| -rw-r--r-- | src/irc/irc-recv.c | 51 | ||||
| -rw-r--r-- | weechat/ChangeLog | 3 | ||||
| -rw-r--r-- | weechat/po/cs.po | 171 | ||||
| -rw-r--r-- | weechat/po/es.po | 170 | ||||
| -rw-r--r-- | weechat/po/fr.po | 170 | ||||
| -rw-r--r-- | weechat/po/weechat.pot | 158 | ||||
| -rw-r--r-- | weechat/src/gui/gui-common.c | 67 | ||||
| -rw-r--r-- | weechat/src/gui/gui.h | 1 | ||||
| -rw-r--r-- | weechat/src/irc/irc-recv.c | 51 |
16 files changed, 830 insertions, 752 deletions
@@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-01-22 +ChangeLog - 2006-01-24 Version 0.1.8 (under dev!): + * fixed bug with charset in infobar highlights * fixed bug with buffer detection in plugins/scripts commands * fixed bug with /history command * added option "irc_show_away_once", to show away message only once in pv @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-22 22:14+0100\n" -"PO-Revision-Date: 2006-01-14 14:01+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\n" +"PO-Revision-Date: 2006-01-24 15:57+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1376,7 +1376,7 @@ msgstr "off" msgid " (temporary server, will not be saved)" msgstr " (dočasný server, nebude uložen)" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "sekund" @@ -1384,7 +1384,7 @@ msgstr "sekund" msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "neznámý" @@ -1454,8 +1454,8 @@ 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:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n" @@ -1605,8 +1605,8 @@ msgstr "dal voice na" msgid "removes voice from" msgstr "odebral voice z" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s \"%s\" příkaz obdržen bez hosta\n" @@ -1646,268 +1646,262 @@ msgstr "CTCP %sVERSION%s odpověď od %s%s%s: %s\n" 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:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, 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:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" -msgstr "Soukromý %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +#, fuzzy +msgid "Private" +msgstr "Soukromý" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, 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:1359 +#: src/irc/irc-recv.c:1360 #, 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:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" -msgstr "Na %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" +msgstr "Kanálu" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, 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:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, 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:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, 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:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "Na: %s: %s> %s" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "CTCP %sVERSION%s obdržen od %s%s" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s nemohu rozpársovat příkaz \"%s\"\n" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, 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:2228 +#: src/irc/irc-recv.c:2233 #, 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:2360 +#: src/irc/irc-recv.c:2365 #, 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:2389 +#: src/irc/irc-recv.c:2394 #, 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:2400 +#: src/irc/irc-recv.c:2405 #, 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:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%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:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "%s%s%s je pryč: %s\n" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "Uživatelů online: " -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, 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:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s nečinný: " -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "dní" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "den" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "hodin" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "hodina" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "minut" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "minuta" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "sekunda" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "Není nastaveno téma pro %s%s\n" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "Téma pro %s%s%s je: " -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, 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:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "Téma nastevil %s%s%s, %s" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, 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:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, 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:3783 +#: src/irc/irc-recv.c:3788 #, 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:3843 +#: src/irc/irc-recv.c:3848 #, 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:4340 +#: src/irc/irc-recv.c:4345 #, 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:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Přezdívkz %s%s%s: %s[" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "přezdívky" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "přezdívka" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "částeční-ops" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "částečný-op" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "normální" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, 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:4580 +#: src/irc/irc-recv.c:4585 #, 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:4672 +#: src/irc/irc-recv.c:4677 #, 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:4684 +#: src/irc/irc-recv.c:4689 #, 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:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1916,7 +1910,7 @@ 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:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -2082,6 +2076,11 @@ msgstr "%s neomhu poslat DCC\n" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s chyba posílání dat k \"%s\" přes DCC CHAT\n" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "Soukromý %s> %s" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2346,7 +2345,7 @@ msgstr "server" msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "Nedostatek paměti pro infobar zprávu\n" @@ -5257,6 +5256,12 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Ukládám konfiguraci na disk\n" +#~ msgid "On %s: * %s %s" +#~ msgstr "Na %s: * %s %s" + +#~ msgid "On %s: %s> %s" +#~ msgstr "Na: %s: %s> %s" + #~ msgid "default message when away" #~ msgstr "výchozí zprávy, když jsem pryč" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-22 22:14+0100\n" -"PO-Revision-Date: 2006-01-14 14:01+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\n" +"PO-Revision-Date: 2006-01-24 15:56+0100\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1388,7 +1388,7 @@ msgstr "inactivo" msgid " (temporary server, will not be saved)" msgstr " (servidor temporal, no ser guardado)" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "segundos" @@ -1396,7 +1396,7 @@ msgstr "segundos" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "desconocido" @@ -1466,8 +1466,8 @@ 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:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n" @@ -1617,8 +1617,8 @@ msgstr "da voz a" msgid "removes voice from" msgstr "quita la voz a" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s comando \"%s\" recibido sin host \n" @@ -1658,271 +1658,264 @@ msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n" 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:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, 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:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" -msgstr "Privado %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +msgid "Private" +msgstr "Privado" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, 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:1359 +#: src/irc/irc-recv.c:1360 #, 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:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" -msgstr "En %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" +msgstr "Canal" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, 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:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, 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:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, 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:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "En %s: %s> %s" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "CTCP %sVERSION%s recibido de %s%s" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s no es posible analizar el comando \"%s\"\n" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s tipo DCC CHAT desconocido recibido de " -#: src/irc/irc-recv.c:2228 +#: src/irc/irc-recv.c:2233 #, 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:2360 +#: src/irc/irc-recv.c:2365 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s comando \"%s\" recibido sin canal\n" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2394 #, 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:2400 +#: src/irc/irc-recv.c:2405 #, 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:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n" -#: src/irc/irc-recv.c:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "%s%s%s est ausente: %s\n" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "Usuarios conectados: " -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, 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:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactividad: " -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "das" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "da" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "horas" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "hora" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "minutos" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "minuto" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "segundo" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "Sin tema establecido para %s%s\n" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "El tema para %s%s%s es: " -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, 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:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "Tema establecido por %s%s%s, %s" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, 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:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, 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:3783 +#: src/irc/irc-recv.c:3788 #, 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:3843 +#: src/irc/irc-recv.c:3848 #, 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:4340 +#: src/irc/irc-recv.c:4345 #, 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:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Usuarios %s%s%s: %s[" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "usuarios" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "usuario" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "operadores" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "operador" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "semi-operadores" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "semi-operador" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "voces" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "voz" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, 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:4580 +#: src/irc/irc-recv.c:4585 #, 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:4672 +#: src/irc/irc-recv.c:4677 #, 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:4684 +#: src/irc/irc-recv.c:4689 #, 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:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1931,7 +1924,7 @@ msgstr "" "%s: todos los nombres de usuario declarados ya estn en uso, cerrando la " "conexin con el servidor!\n" -#: src/irc/irc-recv.c:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -2099,6 +2092,11 @@ msgstr "%s no es posible enviar el DCC\n" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "Privado %s> %s" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2368,7 +2366,7 @@ msgstr "servidor" msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de informacin\n" @@ -5341,5 +5339,11 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Guardar configuracin a disco\n" +#~ msgid "On %s: * %s %s" +#~ msgstr "En %s: * %s %s" + +#~ msgid "On %s: %s> %s" +#~ msgstr "En %s: %s> %s" + #~ msgid "default message when away" #~ msgstr "mensaje por defecto para el estado ausente" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-22 22:14+0100\n" -"PO-Revision-Date: 2006-01-22 22:14+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\n" +"PO-Revision-Date: 2006-01-24 15:56+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1383,7 +1383,7 @@ msgstr "dsactiv" msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauv)" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "secondes" @@ -1391,7 +1391,7 @@ msgstr "secondes" msgid "(hidden)" msgstr "(cach)" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "inconnu" @@ -1463,8 +1463,8 @@ 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:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "%s canal \"%s\" non trouv pour la commande \"%s\"\n" @@ -1614,8 +1614,8 @@ msgstr "donne la voix " msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reue sans host\n" @@ -1655,271 +1655,264 @@ msgstr "CTCP %sVERSION%s rponse de %s%s%s: %s\n" 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:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, 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:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" -msgstr "Priv %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +msgid "Private" +msgstr "Priv" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, 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:1359 +#: src/irc/irc-recv.c:1360 #, 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:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" -msgstr "Sur %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" +msgstr "Canal" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, 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:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, 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:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, 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:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "Sur %s: %s> %s" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "CTCP %sVERSION%s reu de %s%s" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s type de DCC CHAT inconnu reu de " -#: src/irc/irc-recv.c:2228 +#: src/irc/irc-recv.c:2233 #, 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:2360 +#: src/irc/irc-recv.c:2365 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reue sans canal\n" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2394 #, 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:2400 +#: src/irc/irc-recv.c:2405 #, 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:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n" -#: src/irc/irc-recv.c:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "%s%s%s est absent: %s\n" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, 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:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactivit: " -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "Pas de titre dfini pour %s%s\n" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "Le titre pour %s%s%s est: " -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, 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:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "Titre dfini par %s%s%s, %s" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, 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:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, 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:3783 +#: src/irc/irc-recv.c:3788 #, 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:3843 +#: src/irc/irc-recv.c:3848 #, 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:4340 +#: src/irc/irc-recv.c:4345 #, 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:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Utilisateurs %s%s%s: %s[" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, 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:4580 +#: src/irc/irc-recv.c:4585 #, 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:4672 +#: src/irc/irc-recv.c:4677 #, 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:4684 +#: src/irc/irc-recv.c:4689 #, 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:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1928,7 +1921,7 @@ 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:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -2095,6 +2088,11 @@ msgstr "%s impossible d'envoyer le DCC\n" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s erreur d'envoi de donnes \"%s\" via DCC CHAT\n" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "Priv %s> %s" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2366,7 +2364,7 @@ msgstr "serveur" msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "Pas assez de mmoire pour un message de la barre d'infos\n" @@ -5331,5 +5329,11 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" +#~ msgid "On %s: * %s %s" +#~ msgstr "Sur %s: * %s %s" + +#~ msgid "On %s: %s> %s" +#~ msgstr "Sur %s: %s> %s" + #~ msgid "default message when away" #~ msgstr "message par dfaut pour l'absence" diff --git a/po/weechat.pot b/po/weechat.pot index a2129dbc2..cbf85a206 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-01-22 22:14+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\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" @@ -1271,7 +1271,7 @@ msgstr "" msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "" @@ -1279,7 +1279,7 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "" @@ -1347,8 +1347,8 @@ msgid "You have been invited to %s%s%s by %s%s\n" msgstr "" #: src/irc/irc-recv.c:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "" @@ -1498,8 +1498,8 @@ msgstr "" msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" @@ -1539,272 +1539,265 @@ msgstr "" msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +msgid "Private" msgstr "" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:1359 +#: src/irc/irc-recv.c:1360 #, c-format msgid "%s%s %s(%s%s%s)%s has left %s%s" msgstr "" -#: src/irc/irc-recv.c:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" msgstr "" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, c-format msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n" msgstr "" -#: src/irc/irc-recv.c:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, c-format msgid "CTCP %sPING%s received from %s%s\n" msgstr "" -#: src/irc/irc-recv.c:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, c-format msgid "Unknown CTCP %s%s%s received from %s%s" msgstr "" -#: src/irc/irc-recv.c:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "" -#: src/irc/irc-recv.c:2228 +#: src/irc/irc-recv.c:2233 #, c-format msgid "%s%s %s(%s%s%s)%s has quit" msgstr "" -#: src/irc/irc-recv.c:2360 +#: src/irc/irc-recv.c:2365 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2394 #, c-format msgid "%s%s%s has changed topic for %s%s%s to:" msgstr "" -#: src/irc/irc-recv.c:2400 +#: src/irc/irc-recv.c:2405 #, c-format msgid "%s%s%s has unset topic for %s%s\n" msgstr "" -#: src/irc/irc-recv.c:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "" -#: src/irc/irc-recv.c:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, c-format msgid "%s%s %s(%s%s@%s%s)%s was %s\n" msgstr "" -#: src/irc/irc-recv.c:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "" -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:3783 +#: src/irc/irc-recv.c:3788 #, c-format msgid "%s%s%s has invited %s%s%s on %s%s\n" msgstr "" -#: src/irc/irc-recv.c:3843 +#: src/irc/irc-recv.c:3848 #, c-format msgid "Channel reop %s%s%s: %s%s\n" msgstr "" -#: src/irc/irc-recv.c:4340 +#: src/irc/irc-recv.c:4345 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, c-format msgid "%s[%s%s%s] %s%s%s banned by " msgstr "" -#: src/irc/irc-recv.c:4580 +#: src/irc/irc-recv.c:4585 #, c-format msgid "%s[%s%s%s] %s%s%s banned\n" msgstr "" -#: src/irc/irc-recv.c:4672 +#: src/irc/irc-recv.c:4677 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4684 +#: src/irc/irc-recv.c:4689 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "" -#: src/irc/irc-recv.c:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -1960,6 +1953,11 @@ msgstr "" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2204,7 +2202,7 @@ msgstr "" msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "" diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 2b396fadb..20b4912a3 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -1022,40 +1022,61 @@ gui_printf_internal (t_gui_buffer *buffer, int display_time, int type, char *mes void gui_infobar_printf (int time_displayed, int color, char *message, ...) { - static char buffer[1024]; + static char buf[1024]; va_list argptr; t_gui_infobar *ptr_infobar; - char *pos, *buf2, *buf3; + char *pos; va_start (argptr, message); - vsnprintf (buffer, sizeof (buffer) - 1, message, argptr); + vsnprintf (buf, sizeof (buf) - 1, message, argptr); va_end (argptr); - buf2 = (char *)gui_color_decode ((unsigned char *)buffer, 0); + ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar)); + if (ptr_infobar) + { + ptr_infobar->color = color; + ptr_infobar->text = strdup (buf); + pos = strchr (ptr_infobar->text, '\n'); + if (pos) + pos[0] = '\0'; + ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed; + ptr_infobar->next_infobar = gui_infobar; + gui_infobar = ptr_infobar; + gui_draw_buffer_infobar (gui_current_window->buffer, 1); + } + else + weechat_log_printf (_("Not enough memory for infobar message\n")); +} + +/* + * gui_infobar_printf_from_buffer: remove color, convert charset, then + * display message in infobar + */ + +void +gui_infobar_printf_from_buffer (t_gui_buffer *buffer, int time_displayed, + int color, char *message1, char *message, ...) +{ + static char buf[1024]; + va_list argptr; + char *buf2, *buf3; + va_start (argptr, message); + vsnprintf (buf, sizeof (buf) - 1, message, argptr); + va_end (argptr); + + buf2 = (char *)gui_color_decode ((unsigned char *)buf, 0); + + weechat_log_printf ("avant decodage: %s\n", buf); if (buf2) - buf3 = channel_iconv_decode (NULL, NULL, buf2); + buf3 = channel_iconv_decode (SERVER(buffer), CHANNEL(buffer), buf2); else buf3 = NULL; + weechat_log_printf ("apres decodage: %s\n", buf3); - if (buf3) - { - ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar)); - if (ptr_infobar) - { - ptr_infobar->color = color; - ptr_infobar->text = strdup (buf3); - pos = strchr (ptr_infobar->text, '\n'); - if (pos) - pos[0] = '\0'; - ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed; - ptr_infobar->next_infobar = gui_infobar; - gui_infobar = ptr_infobar; - gui_draw_buffer_infobar (gui_current_window->buffer, 1); - } - else - weechat_log_printf (_("Not enough memory for infobar message\n")); - } + gui_infobar_printf (time_displayed, color, + "%s%s", message1, + (buf3) ? buf3 : ((buf2) ? buf2 : buf)); if (buf2) free (buf2); diff --git a/src/gui/gui.h b/src/gui/gui.h index eb89671db..d6d05a79f 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -408,6 +408,7 @@ extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int); extern void gui_buffer_clear (t_gui_buffer *); extern void gui_buffer_clear_all (); extern void gui_infobar_printf (int, int, char *, ...); +extern void gui_infobar_printf_from_buffer (t_gui_buffer *, int, int, char *, char *, ...); extern void gui_window_free (t_gui_window *); extern void gui_infobar_remove (); extern void gui_buffer_free (t_gui_buffer *, int); diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index de24e19da..b4be5b46a 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -1249,10 +1249,11 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen nick); if ( (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private"), " %s> %s", + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK, @@ -1510,11 +1511,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume if ( (cfg_look_infobar) && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("On %s: * %s %s"), - ptr_channel->name, - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Channel"), " %s: * %s %s", + ptr_channel->name, + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, @@ -1626,11 +1628,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume if ( (cfg_look_infobar) && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("On %s: %s> %s"), - ptr_channel->name, - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Channel"), " %s: %s> %s", + ptr_channel->name, + nick, pos); } else irc_display_nick (ptr_channel->buffer, ptr_nick, @@ -2065,11 +2068,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume if ( (cfg_look_infobar) && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("On %s: * %s %s"), - ptr_channel->name, - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Channel"), " %s: * %s %s", + ptr_channel->name, + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, @@ -2153,10 +2157,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume nick); if ( (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private"), " %s> %s", + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK, diff --git a/weechat/ChangeLog b/weechat/ChangeLog index f2e19adcc..0c0494194 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-01-22 +ChangeLog - 2006-01-24 Version 0.1.8 (under dev!): + * fixed bug with charset in infobar highlights * fixed bug with buffer detection in plugins/scripts commands * fixed bug with /history command * added option "irc_show_away_once", to show away message only once in pv diff --git a/weechat/po/cs.po b/weechat/po/cs.po index a43b2c05d..b96486c41 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-22 22:14+0100\n" -"PO-Revision-Date: 2006-01-14 14:01+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\n" +"PO-Revision-Date: 2006-01-24 15:57+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1376,7 +1376,7 @@ msgstr "off" msgid " (temporary server, will not be saved)" msgstr " (dočasný server, nebude uložen)" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "sekund" @@ -1384,7 +1384,7 @@ msgstr "sekund" msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "neznámý" @@ -1454,8 +1454,8 @@ 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:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n" @@ -1605,8 +1605,8 @@ msgstr "dal voice na" msgid "removes voice from" msgstr "odebral voice z" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s \"%s\" příkaz obdržen bez hosta\n" @@ -1646,268 +1646,262 @@ msgstr "CTCP %sVERSION%s odpověď od %s%s%s: %s\n" 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:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, 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:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" -msgstr "Soukromý %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +#, fuzzy +msgid "Private" +msgstr "Soukromý" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, 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:1359 +#: src/irc/irc-recv.c:1360 #, 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:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" -msgstr "Na %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" +msgstr "Kanálu" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, 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:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, 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:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, 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:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "Na: %s: %s> %s" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "CTCP %sVERSION%s obdržen od %s%s" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s nemohu rozpársovat příkaz \"%s\"\n" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, 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:2228 +#: src/irc/irc-recv.c:2233 #, 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:2360 +#: src/irc/irc-recv.c:2365 #, 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:2389 +#: src/irc/irc-recv.c:2394 #, 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:2400 +#: src/irc/irc-recv.c:2405 #, 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:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%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:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "%s%s%s je pryč: %s\n" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "Uživatelů online: " -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, 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:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s nečinný: " -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "dní" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "den" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "hodin" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "hodina" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "minut" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "minuta" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "sekunda" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "Není nastaveno téma pro %s%s\n" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "Téma pro %s%s%s je: " -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, 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:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "Téma nastevil %s%s%s, %s" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, 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:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, 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:3783 +#: src/irc/irc-recv.c:3788 #, 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:3843 +#: src/irc/irc-recv.c:3848 #, 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:4340 +#: src/irc/irc-recv.c:4345 #, 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:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Přezdívkz %s%s%s: %s[" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "přezdívky" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "přezdívka" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "částeční-ops" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "částečný-op" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "normální" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, 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:4580 +#: src/irc/irc-recv.c:4585 #, 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:4672 +#: src/irc/irc-recv.c:4677 #, 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:4684 +#: src/irc/irc-recv.c:4689 #, 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:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1916,7 +1910,7 @@ 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:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -2082,6 +2076,11 @@ msgstr "%s neomhu poslat DCC\n" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s chyba posílání dat k \"%s\" přes DCC CHAT\n" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "Soukromý %s> %s" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2346,7 +2345,7 @@ msgstr "server" msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "Nedostatek paměti pro infobar zprávu\n" @@ -5257,6 +5256,12 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Ukládám konfiguraci na disk\n" +#~ msgid "On %s: * %s %s" +#~ msgstr "Na %s: * %s %s" + +#~ msgid "On %s: %s> %s" +#~ msgstr "Na: %s: %s> %s" + #~ msgid "default message when away" #~ msgstr "výchozí zprávy, když jsem pryč" diff --git a/weechat/po/es.po b/weechat/po/es.po index 563b87370..3b3a93c1a 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-22 22:14+0100\n" -"PO-Revision-Date: 2006-01-14 14:01+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\n" +"PO-Revision-Date: 2006-01-24 15:56+0100\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1388,7 +1388,7 @@ msgstr "inactivo" msgid " (temporary server, will not be saved)" msgstr " (servidor temporal, no ser guardado)" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "segundos" @@ -1396,7 +1396,7 @@ msgstr "segundos" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "desconocido" @@ -1466,8 +1466,8 @@ 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:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n" @@ -1617,8 +1617,8 @@ msgstr "da voz a" msgid "removes voice from" msgstr "quita la voz a" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s comando \"%s\" recibido sin host \n" @@ -1658,271 +1658,264 @@ msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n" 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:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, 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:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" -msgstr "Privado %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +msgid "Private" +msgstr "Privado" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, 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:1359 +#: src/irc/irc-recv.c:1360 #, 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:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" -msgstr "En %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" +msgstr "Canal" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, 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:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, 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:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, 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:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "En %s: %s> %s" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "CTCP %sVERSION%s recibido de %s%s" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s no es posible analizar el comando \"%s\"\n" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s tipo DCC CHAT desconocido recibido de " -#: src/irc/irc-recv.c:2228 +#: src/irc/irc-recv.c:2233 #, 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:2360 +#: src/irc/irc-recv.c:2365 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s comando \"%s\" recibido sin canal\n" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2394 #, 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:2400 +#: src/irc/irc-recv.c:2405 #, 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:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n" -#: src/irc/irc-recv.c:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "%s%s%s est ausente: %s\n" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "Usuarios conectados: " -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, 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:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactividad: " -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "das" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "da" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "horas" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "hora" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "minutos" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "minuto" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "segundo" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "Sin tema establecido para %s%s\n" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "El tema para %s%s%s es: " -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, 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:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "Tema establecido por %s%s%s, %s" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, 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:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, 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:3783 +#: src/irc/irc-recv.c:3788 #, 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:3843 +#: src/irc/irc-recv.c:3848 #, 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:4340 +#: src/irc/irc-recv.c:4345 #, 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:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Usuarios %s%s%s: %s[" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "usuarios" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "usuario" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "operadores" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "operador" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "semi-operadores" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "semi-operador" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "voces" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "voz" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, 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:4580 +#: src/irc/irc-recv.c:4585 #, 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:4672 +#: src/irc/irc-recv.c:4677 #, 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:4684 +#: src/irc/irc-recv.c:4689 #, 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:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1931,7 +1924,7 @@ msgstr "" "%s: todos los nombres de usuario declarados ya estn en uso, cerrando la " "conexin con el servidor!\n" -#: src/irc/irc-recv.c:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -2099,6 +2092,11 @@ msgstr "%s no es posible enviar el DCC\n" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "Privado %s> %s" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2368,7 +2366,7 @@ msgstr "servidor" msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de informacin\n" @@ -5341,5 +5339,11 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Guardar configuracin a disco\n" +#~ msgid "On %s: * %s %s" +#~ msgstr "En %s: * %s %s" + +#~ msgid "On %s: %s> %s" +#~ msgstr "En %s: %s> %s" + #~ msgid "default message when away" #~ msgstr "mensaje por defecto para el estado ausente" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 192d27eb7..e6b8c75b7 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.8-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2006-01-22 22:14+0100\n" -"PO-Revision-Date: 2006-01-22 22:14+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\n" +"PO-Revision-Date: 2006-01-24 15:56+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1383,7 +1383,7 @@ msgstr "dsactiv" msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauv)" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "secondes" @@ -1391,7 +1391,7 @@ msgstr "secondes" msgid "(hidden)" msgstr "(cach)" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "inconnu" @@ -1463,8 +1463,8 @@ 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:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "%s canal \"%s\" non trouv pour la commande \"%s\"\n" @@ -1614,8 +1614,8 @@ msgstr "donne la voix " msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reue sans host\n" @@ -1655,271 +1655,264 @@ msgstr "CTCP %sVERSION%s rponse de %s%s%s: %s\n" 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:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, 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:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" -msgstr "Priv %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +msgid "Private" +msgstr "Priv" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, 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:1359 +#: src/irc/irc-recv.c:1360 #, 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:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" -msgstr "Sur %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" +msgstr "Canal" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, 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:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, 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:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, 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:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "Sur %s: %s> %s" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "CTCP %sVERSION%s reu de %s%s" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s type de DCC CHAT inconnu reu de " -#: src/irc/irc-recv.c:2228 +#: src/irc/irc-recv.c:2233 #, 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:2360 +#: src/irc/irc-recv.c:2365 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reue sans canal\n" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2394 #, 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:2400 +#: src/irc/irc-recv.c:2405 #, 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:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n" -#: src/irc/irc-recv.c:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "%s%s%s est absent: %s\n" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, 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:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactivit: " -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "Pas de titre dfini pour %s%s\n" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "Le titre pour %s%s%s est: " -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, 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:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "Titre dfini par %s%s%s, %s" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, 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:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, 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:3783 +#: src/irc/irc-recv.c:3788 #, 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:3843 +#: src/irc/irc-recv.c:3848 #, 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:4340 +#: src/irc/irc-recv.c:4345 #, 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:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "Utilisateurs %s%s%s: %s[" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, 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:4580 +#: src/irc/irc-recv.c:4585 #, 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:4672 +#: src/irc/irc-recv.c:4677 #, 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:4684 +#: src/irc/irc-recv.c:4689 #, 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:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1928,7 +1921,7 @@ 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:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -2095,6 +2088,11 @@ msgstr "%s impossible d'envoyer le DCC\n" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s erreur d'envoi de donnes \"%s\" via DCC CHAT\n" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "Priv %s> %s" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2366,7 +2364,7 @@ msgstr "serveur" msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "Pas assez de mmoire pour un message de la barre d'infos\n" @@ -5331,5 +5329,11 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" +#~ msgid "On %s: * %s %s" +#~ msgstr "Sur %s: * %s %s" + +#~ msgid "On %s: %s> %s" +#~ msgstr "Sur %s: %s> %s" + #~ msgid "default message when away" #~ msgstr "message par dfaut pour l'absence" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index a2129dbc2..cbf85a206 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-01-22 22:14+0100\n" +"POT-Creation-Date: 2006-01-24 15:55+0100\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" @@ -1271,7 +1271,7 @@ msgstr "" msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3191 +#: src/irc/irc-display.c:271 src/irc/irc-display.c:300 src/irc/irc-recv.c:3196 msgid "seconds" msgstr "" @@ -1279,7 +1279,7 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718 +#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4723 msgid "unknown" msgstr "" @@ -1347,8 +1347,8 @@ msgid "You have been invited to %s%s%s by %s%s\n" msgstr "" #: src/irc/irc-recv.c:376 src/irc/irc-recv.c:470 src/irc/irc-recv.c:1009 -#: src/irc/irc-recv.c:1388 src/irc/irc-recv.c:1647 src/irc/irc-recv.c:3563 -#: src/irc/irc-recv.c:3584 src/irc/irc-recv.c:3645 src/irc/irc-recv.c:3716 +#: src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1650 src/irc/irc-recv.c:3568 +#: src/irc/irc-recv.c:3589 src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3721 #, c-format msgid "%s channel \"%s\" not found for \"%s\" command\n" msgstr "" @@ -1498,8 +1498,8 @@ msgstr "" msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1466 -#: src/irc/irc-recv.c:2205 +#: src/irc/irc-recv.c:968 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1467 +#: src/irc/irc-recv.c:2210 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" @@ -1539,272 +1539,265 @@ msgstr "" msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2044 src/irc/irc-recv.c:2135 +#: src/irc/irc-recv.c:1231 src/irc/irc-recv.c:2047 src/irc/irc-recv.c:2139 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1254 src/irc/irc-recv.c:2158 src/irc/irc-dcc.c:1217 -#, c-format -msgid "Private %s> %s" +#: src/irc/irc-recv.c:1255 src/irc/irc-recv.c:2163 +msgid "Private" msgstr "" -#: src/irc/irc-recv.c:1319 +#: src/irc/irc-recv.c:1320 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:1359 +#: src/irc/irc-recv.c:1360 #, c-format msgid "%s%s %s(%s%s%s)%s has left %s%s" msgstr "" -#: src/irc/irc-recv.c:1515 src/irc/irc-recv.c:2070 -#, c-format -msgid "On %s: * %s %s" +#: src/irc/irc-recv.c:1517 src/irc/irc-recv.c:1634 src/irc/irc-recv.c:2074 +msgid "Channel" msgstr "" -#: src/irc/irc-recv.c:1540 +#: src/irc/irc-recv.c:1542 #, c-format msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n" msgstr "" -#: src/irc/irc-recv.c:1570 src/irc/irc-recv.c:1741 +#: src/irc/irc-recv.c:1572 src/irc/irc-recv.c:1744 #, c-format msgid "CTCP %sPING%s received from %s%s\n" msgstr "" -#: src/irc/irc-recv.c:1599 src/irc/irc-recv.c:2107 +#: src/irc/irc-recv.c:1601 src/irc/irc-recv.c:2111 #, c-format msgid "Unknown CTCP %s%s%s received from %s%s" msgstr "" -#: src/irc/irc-recv.c:1631 -#, c-format -msgid "On %s: %s> %s" -msgstr "" - -#: src/irc/irc-recv.c:1702 +#: src/irc/irc-recv.c:1705 #, c-format msgid "CTCP %sVERSION%s received from %s%s" msgstr "" -#: src/irc/irc-recv.c:1759 src/irc/irc-recv.c:1780 src/irc/irc-recv.c:1796 -#: src/irc/irc-recv.c:1812 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:1859 -#: src/irc/irc-recv.c:1875 src/irc/irc-recv.c:1900 src/irc/irc-recv.c:1921 -#: src/irc/irc-recv.c:1937 src/irc/irc-recv.c:1962 src/irc/irc-recv.c:1983 -#: src/irc/irc-recv.c:1998 src/irc/irc-recv.c:2181 src/irc/irc-recv.c:2524 -#: src/irc/irc-recv.c:3923 src/irc/irc-recv.c:3938 src/irc/irc-recv.c:3953 -#: src/irc/irc-recv.c:3968 src/irc/irc-recv.c:3981 src/irc/irc-recv.c:4046 -#: src/irc/irc-recv.c:4060 src/irc/irc-recv.c:4294 src/irc/irc-recv.c:4352 -#: src/irc/irc-recv.c:4490 src/irc/irc-recv.c:4505 src/irc/irc-recv.c:4611 -#: src/irc/irc-recv.c:4625 +#: src/irc/irc-recv.c:1762 src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1799 +#: src/irc/irc-recv.c:1815 src/irc/irc-recv.c:1841 src/irc/irc-recv.c:1862 +#: src/irc/irc-recv.c:1878 src/irc/irc-recv.c:1903 src/irc/irc-recv.c:1924 +#: src/irc/irc-recv.c:1940 src/irc/irc-recv.c:1965 src/irc/irc-recv.c:1986 +#: src/irc/irc-recv.c:2001 src/irc/irc-recv.c:2186 src/irc/irc-recv.c:2529 +#: src/irc/irc-recv.c:3928 src/irc/irc-recv.c:3943 src/irc/irc-recv.c:3958 +#: src/irc/irc-recv.c:3973 src/irc/irc-recv.c:3986 src/irc/irc-recv.c:4051 +#: src/irc/irc-recv.c:4065 src/irc/irc-recv.c:4299 src/irc/irc-recv.c:4357 +#: src/irc/irc-recv.c:4495 src/irc/irc-recv.c:4510 src/irc/irc-recv.c:4616 +#: src/irc/irc-recv.c:4630 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2011 +#: src/irc/irc-recv.c:2014 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "" -#: src/irc/irc-recv.c:2228 +#: src/irc/irc-recv.c:2233 #, c-format msgid "%s%s %s(%s%s%s)%s has quit" msgstr "" -#: src/irc/irc-recv.c:2360 +#: src/irc/irc-recv.c:2365 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2394 #, c-format msgid "%s%s%s has changed topic for %s%s%s to:" msgstr "" -#: src/irc/irc-recv.c:2400 +#: src/irc/irc-recv.c:2405 #, c-format msgid "%s%s%s has unset topic for %s%s\n" msgstr "" -#: src/irc/irc-recv.c:2510 +#: src/irc/irc-recv.c:2515 #, c-format msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "" -#: src/irc/irc-recv.c:2574 +#: src/irc/irc-recv.c:2579 #, c-format msgid "%s%s%s is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:2666 +#: src/irc/irc-recv.c:2671 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:3042 +#: src/irc/irc-recv.c:3047 #, c-format msgid "%s%s %s(%s%s@%s%s)%s was %s\n" msgstr "" -#: src/irc/irc-recv.c:3163 +#: src/irc/irc-recv.c:3168 #, c-format msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "days" msgstr "" -#: src/irc/irc-recv.c:3175 src/common/command.c:3260 src/common/command.c:3278 +#: src/irc/irc-recv.c:3180 src/common/command.c:3260 src/common/command.c:3278 msgid "day" msgstr "" -#: src/irc/irc-recv.c:3179 +#: src/irc/irc-recv.c:3184 #, 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:3183 +#: src/irc/irc-recv.c:3188 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:3183 +#: src/irc/irc-recv.c:3188 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:3187 +#: src/irc/irc-recv.c:3192 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:3191 +#: src/irc/irc-recv.c:3196 msgid "second" msgstr "" -#: src/irc/irc-recv.c:3575 +#: src/irc/irc-recv.c:3580 #, c-format msgid "No topic set for %s%s\n" msgstr "" -#: src/irc/irc-recv.c:3631 +#: src/irc/irc-recv.c:3636 #, c-format msgid "Topic for %s%s%s is: " msgstr "" -#: src/irc/irc-recv.c:3655 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3798 +#: src/irc/irc-recv.c:3660 src/irc/irc-recv.c:3748 src/irc/irc-recv.c:3803 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:3705 +#: src/irc/irc-recv.c:3710 #, c-format msgid "Topic set by %s%s%s, %s" msgstr "" -#: src/irc/irc-recv.c:3725 +#: src/irc/irc-recv.c:3730 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:3734 src/irc/irc-recv.c:3807 +#: src/irc/irc-recv.c:3739 src/irc/irc-recv.c:3812 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:3783 +#: src/irc/irc-recv.c:3788 #, c-format msgid "%s%s%s has invited %s%s%s on %s%s\n" msgstr "" -#: src/irc/irc-recv.c:3843 +#: src/irc/irc-recv.c:3848 #, c-format msgid "Channel reop %s%s%s: %s%s\n" msgstr "" -#: src/irc/irc-recv.c:4340 +#: src/irc/irc-recv.c:4345 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4398 +#: src/irc/irc-recv.c:4403 #, c-format msgid "Nicks %s%s%s: %s[" msgstr "" -#: src/irc/irc-recv.c:4419 +#: src/irc/irc-recv.c:4424 #, 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:4427 +#: src/irc/irc-recv.c:4432 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:4427 +#: src/irc/irc-recv.c:4432 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:4432 +#: src/irc/irc-recv.c:4437 msgid "op" msgstr "" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:4436 +#: src/irc/irc-recv.c:4441 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:4440 +#: src/irc/irc-recv.c:4445 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:4444 +#: src/irc/irc-recv.c:4449 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:4545 +#: src/irc/irc-recv.c:4550 #, c-format msgid "%s[%s%s%s] %s%s%s banned by " msgstr "" -#: src/irc/irc-recv.c:4580 +#: src/irc/irc-recv.c:4585 #, c-format msgid "%s[%s%s%s] %s%s%s banned\n" msgstr "" -#: src/irc/irc-recv.c:4672 +#: src/irc/irc-recv.c:4677 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4684 +#: src/irc/irc-recv.c:4689 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:4696 +#: src/irc/irc-recv.c:4701 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "" -#: src/irc/irc-recv.c:4706 +#: src/irc/irc-recv.c:4711 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -1960,6 +1953,11 @@ msgstr "" msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "" +#: src/irc/irc-dcc.c:1217 +#, c-format +msgid "Private %s> %s" +msgstr "" + #: src/irc/irc-dcc.c:1416 #, c-format msgid "" @@ -2204,7 +2202,7 @@ msgstr "" msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:1057 +#: src/gui/gui-common.c:1048 msgid "Not enough memory for infobar message\n" msgstr "" diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c index 2b396fadb..20b4912a3 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -1022,40 +1022,61 @@ gui_printf_internal (t_gui_buffer *buffer, int display_time, int type, char *mes void gui_infobar_printf (int time_displayed, int color, char *message, ...) { - static char buffer[1024]; + static char buf[1024]; va_list argptr; t_gui_infobar *ptr_infobar; - char *pos, *buf2, *buf3; + char *pos; va_start (argptr, message); - vsnprintf (buffer, sizeof (buffer) - 1, message, argptr); + vsnprintf (buf, sizeof (buf) - 1, message, argptr); va_end (argptr); - buf2 = (char *)gui_color_decode ((unsigned char *)buffer, 0); + ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar)); + if (ptr_infobar) + { + ptr_infobar->color = color; + ptr_infobar->text = strdup (buf); + pos = strchr (ptr_infobar->text, '\n'); + if (pos) + pos[0] = '\0'; + ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed; + ptr_infobar->next_infobar = gui_infobar; + gui_infobar = ptr_infobar; + gui_draw_buffer_infobar (gui_current_window->buffer, 1); + } + else + weechat_log_printf (_("Not enough memory for infobar message\n")); +} + +/* + * gui_infobar_printf_from_buffer: remove color, convert charset, then + * display message in infobar + */ + +void +gui_infobar_printf_from_buffer (t_gui_buffer *buffer, int time_displayed, + int color, char *message1, char *message, ...) +{ + static char buf[1024]; + va_list argptr; + char *buf2, *buf3; + va_start (argptr, message); + vsnprintf (buf, sizeof (buf) - 1, message, argptr); + va_end (argptr); + + buf2 = (char *)gui_color_decode ((unsigned char *)buf, 0); + + weechat_log_printf ("avant decodage: %s\n", buf); if (buf2) - buf3 = channel_iconv_decode (NULL, NULL, buf2); + buf3 = channel_iconv_decode (SERVER(buffer), CHANNEL(buffer), buf2); else buf3 = NULL; + weechat_log_printf ("apres decodage: %s\n", buf3); - if (buf3) - { - ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar)); - if (ptr_infobar) - { - ptr_infobar->color = color; - ptr_infobar->text = strdup (buf3); - pos = strchr (ptr_infobar->text, '\n'); - if (pos) - pos[0] = '\0'; - ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed; - ptr_infobar->next_infobar = gui_infobar; - gui_infobar = ptr_infobar; - gui_draw_buffer_infobar (gui_current_window->buffer, 1); - } - else - weechat_log_printf (_("Not enough memory for infobar message\n")); - } + gui_infobar_printf (time_displayed, color, + "%s%s", message1, + (buf3) ? buf3 : ((buf2) ? buf2 : buf)); if (buf2) free (buf2); diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index eb89671db..d6d05a79f 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -408,6 +408,7 @@ extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int); extern void gui_buffer_clear (t_gui_buffer *); extern void gui_buffer_clear_all (); extern void gui_infobar_printf (int, int, char *, ...); +extern void gui_infobar_printf_from_buffer (t_gui_buffer *, int, int, char *, char *, ...); extern void gui_window_free (t_gui_window *); extern void gui_infobar_remove (); extern void gui_buffer_free (t_gui_buffer *, int); diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index de24e19da..b4be5b46a 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -1249,10 +1249,11 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen nick); if ( (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private"), " %s> %s", + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK, @@ -1510,11 +1511,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume if ( (cfg_look_infobar) && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("On %s: * %s %s"), - ptr_channel->name, - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Channel"), " %s: * %s %s", + ptr_channel->name, + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, @@ -1626,11 +1628,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume if ( (cfg_look_infobar) && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("On %s: %s> %s"), - ptr_channel->name, - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Channel"), " %s: %s> %s", + ptr_channel->name, + nick, pos); } else irc_display_nick (ptr_channel->buffer, ptr_nick, @@ -2065,11 +2068,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume if ( (cfg_look_infobar) && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("On %s: * %s %s"), - ptr_channel->name, - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Channel"), " %s: * %s %s", + ptr_channel->name, + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, @@ -2153,10 +2157,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume nick); if ( (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - nick, pos); + gui_infobar_printf_from_buffer (ptr_channel->buffer, + cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private"), " %s> %s", + nick, pos); } else gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK, |