Moved the language strings which are only used once

out of the core and into the modules that use them.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/nickserv.cpp b/src/nickserv.cpp
index f841ced10..920eaa6b2 100644
--- a/src/nickserv.cpp
+++ b/src/nickserv.cpp
@@ -172,7 +172,7 @@ int validate_user(User *u)
 	NickRequest *nr = findrequestnick(u->nick);
 	if (nr)
 	{
-		u->SendMessage(NickServ, NICK_IS_PREREG);
+		u->SendMessage(NickServ, LanguageString::NICK_IS_PREREG);
 		return 0;
 	}
 
@@ -182,14 +182,14 @@ int validate_user(User *u)
 
 	if (na->HasFlag(NS_FORBIDDEN))
 	{
-		u->SendMessage(NickServ, NICK_MAY_NOT_BE_USED);
+		u->SendMessage(NickServ, _("This nickname may not be used.  Please choose another one."));
 		u->Collide(na);
 		return 0;
 	}
 
 	if (na->nc->HasFlag(NI_SUSPENDED))
 	{
-		u->SendMessage(NickServ, NICK_X_SUSPENDED, u->nick.c_str());
+		u->SendMessage(NickServ, LanguageString::NICK_X_SUSPENDED, u->nick.c_str());
 		u->Collide(na);
 		return 0;
 	}
@@ -209,26 +209,26 @@ int validate_user(User *u)
 	if (u->IsRecognized() || !na->nc->HasFlag(NI_KILL_IMMED))
 	{
 		if (na->nc->HasFlag(NI_SECURE))
-			u->SendMessage(NickServ, NICK_IS_SECURE, Config->s_NickServ.c_str());
+			u->SendMessage(NickServ, LanguageString::NICK_IS_SECURE, Config->s_NickServ.c_str());
 		else
-			u->SendMessage(NickServ, NICK_IS_REGISTERED, Config->s_NickServ.c_str());
+			u->SendMessage(NickServ, LanguageString::NICK_IS_REGISTERED, Config->s_NickServ.c_str());
 	}
 
 	if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized())
 	{
 		if (na->nc->HasFlag(NI_KILL_IMMED))
 		{
-			u->SendMessage(NickServ, FORCENICKCHANGE_NOW);
+			u->SendMessage(NickServ, LanguageString::FORCENICKCHANGE_NOW);
 			u->Collide(na);
 		}
 		else if (na->nc->HasFlag(NI_KILL_QUICK))
 		{
-			u->SendMessage(NickServ, FORCENICKCHANGE_IN_20_SECONDS);
+			u->SendMessage(NickServ, _("If you do not change within 20 seconds, I will change your nick."));
 			new NickServCollide(u, 20);
 		}
 		else
 		{
-			u->SendMessage(NickServ, FORCENICKCHANGE_IN_1_MINUTE);
+			u->SendMessage(NickServ, _("If you do not change within one minute, I will change your nick."));
 			new NickServCollide(u, 60);
 		}
 	}