diff options
author | drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-01-24 14:08:36 +0000 |
---|---|---|
committer | drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-01-24 14:08:36 +0000 |
commit | 4b62b08ddf87c0126c6b5a3ca4a75face5c7fbbd (patch) | |
tree | 5b1daeb74f9ad17571b1e3a646ad0d37795b68e7 | |
parent | b5bf30483b3928165ac743a4589cd6803c84ca5c (diff) |
BUILD : 1.7.21 (1352) BUGS : N/A NOTES : Fixed several language erros (missed strings, bad formatting, etc). Added a check for BotServs bots hostname too long.
git-svn-id: svn://svn.anope.org/anope/trunk@1352 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1067 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r-- | Changes | 2 | ||||
-rw-r--r-- | lang/cat.l | 4 | ||||
-rw-r--r-- | lang/de.l | 4 | ||||
-rw-r--r-- | lang/en_us.l | 5 | ||||
-rw-r--r-- | lang/es.l | 4 | ||||
-rw-r--r-- | lang/fr.l | 7 | ||||
-rw-r--r-- | lang/gr.l | 5 | ||||
-rw-r--r-- | lang/hun.l | 9 | ||||
-rw-r--r-- | lang/it.l | 5 | ||||
-rw-r--r-- | lang/nl.l | 4 | ||||
-rw-r--r-- | lang/pl.l | 7 | ||||
-rw-r--r-- | lang/pt.l | 6 | ||||
-rw-r--r-- | lang/ru.l | 4 | ||||
-rw-r--r-- | lang/tr.l | 5 | ||||
-rw-r--r-- | src/core/bs_bot.c | 12 | ||||
-rw-r--r-- | version.log | 6 |
16 files changed, 65 insertions, 24 deletions
@@ -4,6 +4,8 @@ Anope Version S V N 01/15 F listchans now shows if a channel is suspended. [#825] 01/15 F listnicks now shows if a nickname is suspended. [#825] 01/15 F Re-assigned access to OS CHANLIST to Services Opers. [#827] +01/24 F Several language errors. [ #00] +01/24 A Added a check for hosts too long in BotServs bots. [ #00] Provided by Jan Milants <jan_renee@msn.com> - 2008 01/16 F Server traversion with next_server() failed to list all servers. [#831] diff --git a/lang/cat.l b/lang/cat.l index c25e59874..cb31f90c2 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -2440,7 +2440,9 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Idents may only contain valid characters. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. ########################################################################### # # OperServ messages @@ -2407,7 +2407,9 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Idents dürfen nur gültige Zeichen enthalten. BOT_LONG_IDENT - Bot Idents dürfen nur 9 Zeichen enthalten. + Bot Idents dürfen nur %d Zeichen enthalten. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. ########################################################################### # # OperServ messages diff --git a/lang/en_us.l b/lang/en_us.l index 604c126e4..f3d9d592a 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -2361,7 +2361,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Idents may only contain valid characters. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################################### # # OperServ messages @@ -2413,7 +2413,9 @@ BOT_BAD_HOST BOT_BAD_IDENT Los idents de bots pueden contener solo caracteres validos. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Los Idents de bots pueden tener solo %d caracteres. +BOT_LONG_HOST + Los Hosts de bots pueden tener solo %d caracteres. ########################################################################### # # OperServ messages @@ -2463,7 +2463,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Les identds des bots doivent contenir que des caractères valide. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################################### # # OperServ messages @@ -3974,7 +3977,7 @@ NICK_HELP_SASET_HIDE Syntaxe: SASET pseudo HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF} Vous permet d'empêcher l'affichage de certaines parties - des informations quand quelqu'un fait un %R%S INFO sur le pseudo + des informations quand quelqu'un fait un %S INFO sur le pseudo donné. Vous pouvez cacher son adresse e-mail (EMAIL), masque user@host vu pour la dernière fois (USERMASK), et la dernière raison de /QUIT (QUIT). Le second paramètre indique si @@ -2442,7 +2442,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Idents may only contain valid characters. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################################### # # OperServ messages diff --git a/lang/hun.l b/lang/hun.l index f40c7f2e4..3b59e0219 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -1430,8 +1430,6 @@ CHAN_ACCESS_XOP Nem használhatod ezt a parancsot. Használd az AOP, SOP és VOP parancsokat helyette. Írd be: %R%s HELP parancs bõvebb információért. - Ha ki akarod kapcsolni az xOP rendszert, akkor írd be: - %RChanServ set #szobanév xop off. CHAN_ACCESS_XOP_HOP You can't use this command. Use the AOP, SOP, HOP and VOP commands instead. @@ -2406,7 +2404,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Ident csak érvényes karaktereket tartalmazhat. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################### # # OperServ üzenetek @@ -4298,7 +4299,7 @@ CHAN_HELP_REGISTER Megjegyzés: Ha regisztrálsz egy csatornát, elõször regisztrálnod kell a nickneved és azonosítanod kell - magad. (%RNickServ identify jelszó) + magad. (NickServ identify jelszó) Ha még nem nézted meg, akkor lásd még: %R%s HELP. CHAN_HELP_IDENTIFY @@ -2373,7 +2373,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Gli ident dei bot possono contenere unicamente caratteri validi. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################################### # # OperServ messages @@ -2419,7 +2419,9 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Idents mogen alleen geldige tekens bevatten. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents mogen maximaal %d tekens bevatten. +BOT_LONG_HOST + Bot Hosts mogen maximaal %d tekens bevatten. ########################################################################### # @@ -2597,7 +2597,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Ident bota mo¿e zawieraæ tylko prawid³owe znaki. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################################### # # Komunikaty OperServ @@ -5142,7 +5145,7 @@ CHAN_HELP_ACCESS funkcje operatorów kana³u, oraz posiadaæ dostêp do komend %S. Ró¿ne poziomy okre¶laj± inne przywileje. - Napisz msg %S HELP ACCESS LEVELS, + Napisz msg %R%S HELP ACCESS LEVELS, aby uzyskaæ wiêcej informacji. Ka¿dy u¿ytkownik, który nie zosta³ wpisany na listê dostepu, posiada poziom uprawnieñ równy 0. @@ -2383,7 +2383,9 @@ BOT_BAD_HOST BOT_BAD_IDENT A Identd do bot deve conter apenas caracteres válidos. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. ########################################################################### # @@ -3003,7 +3005,7 @@ OPER_MODULE_LIST_FOOTER OPER_MODULE_INFO_LIST Módulo: %s Versão: %s Autor: %s Carregado: %s OPER_MODULE_CMD_LIST - Comando fornecido: /%s %s + Comando fornecido: /%R%s %s OPER_MODULE_MSG_LIST Fornecendo IRCd handler para: %s OPER_MODULE_NO_LIST @@ -2360,7 +2360,9 @@ BOT_BAD_HOST BOT_BAD_IDENT Èäåíò áîòà äîëæåí ñîäåðæàòü òîëüêî äîïóñòèìûå ñèìâîëû äëÿ èäåíòà. BOT_LONG_IDENT - Èäåíò áîòà íå äîëæåí ïðåâûøàòü 9 ñèìâîëîâ. + Èäåíò áîòà íå äîëæåí ïðåâûøàòü %d ñèìâîëîâ. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. ########################################################################### # @@ -2436,7 +2436,10 @@ BOT_BAD_HOST BOT_BAD_IDENT Bot Idents may only contain valid characters. BOT_LONG_IDENT - Bot Idents may only contain 9 characters. + Bot Idents may only contain %d characters. +BOT_LONG_HOST + Bot Hosts may only contain %d characters. + ########################################################################### # # OperServ messages diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 1a81118b8..f35e55152 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -92,7 +92,9 @@ int do_bot(User * u) else if (strlen(nick) > NickLen) notice_lang(s_BotServ, u, BOT_BAD_NICK); else if (strlen(user) >= USERMAX) - notice_lang(s_BotServ, u, BOT_LONG_IDENT); + notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + else if (strlen(user) > HOSTMAX) + notice_lang(s_BotServ, u, BOT_LONG_HOST, HOSTMAX); else { NickAlias *na; @@ -122,7 +124,7 @@ int do_bot(User * u) } for (ch = user; *ch && (ch - user) < USERMAX; ch++) { if (!isalnum(*ch)) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT); + notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } } @@ -188,7 +190,9 @@ int do_bot(User * u) else if (strlen(nick) > NickLen) notice_lang(s_BotServ, u, BOT_BAD_NICK); else if (user && strlen(user) >= USERMAX) - notice_lang(s_BotServ, u, BOT_LONG_IDENT); + notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + else if (host && strlen(host) > HOSTMAX) + notice_lang(s_BotServ, u, BOT_LONG_HOST, HOSTMAX); else { NickAlias *na; @@ -240,7 +244,7 @@ int do_bot(User * u) if (user) { for (ch = user; *ch && (ch - user) < USERMAX; ch++) { if (!isalnum(*ch)) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT); + notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } } diff --git a/version.log b/version.log index f5ba825dd..6993b03e9 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="21" VERSION_EXTRA="-svn" -VERSION_BUILD="1351" +VERSION_BUILD="1352" # $Log$ # +# BUILD : 1.7.21 (1352) +# BUGS : N/A +# NOTES : Fixed several language erros (missed strings, bad formatting, etc). Added a check for BotServs bots hostname too long. +# # BUILD : 1.7.21 (1351) # BUGS : 831 # NOTES : Fixed a bug in next_server() which skipped over all servers right away when passing -1 as param |