Some language fixes closing issue #1124 and #1122, fixed wrong language string invoked in bot add closing issue #1118

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2750 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 18 insertions, 18 deletions

diff --git a/lang/de.l b/lang/de.l
index a0a5f6824..987b84745 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -4042,7 +4042,7 @@ NICK_HELP_GHOST
 	wenn dein Computer abstürtzt oder deine Internet-
 	Verbindung zusammenbricht, wenn du im IRC bist.
 	
-	Wenn du das GHOST Befehk benutzen willst,muss 
+	Wenn du das GHOST Befehl benutzen willst,muss 
 	deine aktuelle Hostmaske (siehe /WHOIS) in der
 	Zugriffsliste des entsprechenden Nicknamens oder
 	in der Gruppe des Nicknamens sein.Weiterhin musst 
diff --git a/lang/en_us.l b/lang/en_us.l
index bd16e7cc4..7519dd4f8 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -4411,8 +4411,8 @@ CHAN_HELP_SET_PEACE
 	Syntax: SET channel PEACE {ON | OFF}
 	
 	Enables or disables the peace option for a channel.
-	When peace is set, an user won't be able to kick,
-	ban or remove a channel status of an user that has
+	When peace is set, a user won't be able to kick,
+	ban or remove a channel status of a user that has
 	a level superior or equal to his via %S commands.
 
 CHAN_HELP_SET_PRIVATE
@@ -6146,7 +6146,7 @@ BOT_HELP_KICK_BOLDS
 	Sets the bolds kicker on or off. When enabled, this
 	option tells the bot to kick users who use bolds.
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6156,7 +6156,7 @@ BOT_HELP_KICK_COLORS
 	Sets the colors kicker on or off. When enabled, this
 	option tells the bot to kick users who use colors.
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6166,7 +6166,7 @@ BOT_HELP_KICK_REVERSES
 	Sets the reverses kicker on or off. When enabled, this
 	option tells the bot to kick users who use reverses.
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6176,7 +6176,7 @@ BOT_HELP_KICK_UNDERLINES
 	Sets the underlines kicker on or off. When enabled, this
 	option tells the bot to kick users who use underlines.
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6192,7 +6192,7 @@ BOT_HELP_KICK_CAPS
 	text line (if not given, it defaults to 10 characters
 	and 25%%).
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6204,7 +6204,7 @@ BOT_HELP_KICK_FLOOD
 	the channel using at least ln lines in secs seconds
 	(if not given, it defaults to 6 lines in 10 seconds).
 	
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6216,7 +6216,7 @@ BOT_HELP_KICK_REPEAT
 	themselves num times (if num is not given, it
 	defaults to 3).
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 
@@ -6231,7 +6231,7 @@ BOT_HELP_KICK_BADWORDS
 	BADWORDS command. Type %R%S HELP BADWORDS for
 	more information.
 
-	ttb is the number of times an user can be kicked
+	ttb is the number of times a user can be kicked
 	before it get banned. Don't give ttb to disable
 	the ban system once activated.
 	
@@ -6248,12 +6248,12 @@ BOT_HELP_BADWORDS
 	
 	The BADWORDS ADD command adds the given word to the
 	badword list. If SINGLE is specified, a kick will be
-	done only if an user says the entire word. If START is 
-	specified, a kick will be done if an user says a word
+	done only if a user says the entire word. If START is 
+	specified, a kick will be done if a user says a word
 	that starts with word. If END is specified, a kick
-	will be done if an user says a word that ends with
+	will be done if a user says a word that ends with
 	word. If you don't specify anything, a kick will
-	be issued every time word is said by an user.
+	be issued every time word is said by a user.
 	
 	The BADWORDS DEL command removes the given word from the
 	bad words list.  If a list of entry numbers is given, those
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index f7dccb3c2..c6a630c7e 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -244,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, USERMAX - 1);
+                        notice_lang(s_BotServ, u, BOT_BAD_IDENT, USERMAX - 1);
                         return MOD_CONT;
                     }
                 }
diff --git a/version.log b/version.log
index 775892432..2f731f94c 100644
--- a/version.log
+++ b/version.log
@@ -1,4 +1,4 @@
-# (C) 2003-2009 Anope Team
+# (C) 2003-2010 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -9,7 +9,7 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="2"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2747"
+VERSION_BUILD="2748"
 
 # $Log$ # Changes since 1.8.2 Release
 #Revision 2747 - Fixed a reply in bs_bot to be correct when you use an invalid ident