Replaced the few language strings we use with #defines to prevent accidentally translating them if we shouldnt

96 files changed, 474 insertions, 483 deletions

diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp
index 0b2402f90..30021ce38 100644
--- a/modules/core/bs_act.cpp
+++ b/modules/core/bs_act.cpp
@@ -29,19 +29,19 @@ class CommandBSAct : public Command
 
 		if (!check_access(u, ci, CA_SAY))
 		{
-			source.Reply(LanguageString::ACCESS_DENIED);
+			source.Reply(_(ACCESS_DENIED));
 			return MOD_CONT;
 		}
 
 		if (!ci->bi)
 		{
-			source.Reply(LanguageString::BOT_NOT_ASSIGNED);
+			source.Reply(_(BOT_NOT_ASSIGNED));
 			return MOD_CONT;
 		}
 
 		if (!ci->c || !ci->c->FindUser(ci->bi))
 		{
-			source.Reply(LanguageString::BOT_NOT_ON_CHANNEL, ci->name.c_str());
+			source.Reply(_(BOT_NOT_ON_CHANNEL), ci->name.c_str());
 			return MOD_CONT;
 		}
 
diff --git a/modules/core/bs_assign.cpp b/modules/core/bs_assign.cpp
index 65e5ff2ea..b1d967305 100644
--- a/modules/core/bs_assign.cpp
+++ b/modules/core/bs_assign.cpp
@@ -30,26 +30,26 @@ class CommandBSAssign : public Command
 
 		if (readonly)
 		{
-			source.Reply(LanguageString::BOT_ASSIGN_READONLY);
+			source.Reply(_(BOT_ASSIGN_READONLY));
 			return MOD_CONT;
 		}
 
 		BotInfo *bi = findbot(nick);
 		if (!bi)
 		{
-			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, nick.c_str());
+			source.Reply(_(BOT_DOES_NOT_EXIST), nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (ci->botflags.HasFlag(BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->Account()->HasPriv("botserv/administration")))
 		{
-			source.Reply(LanguageString::ACCESS_DENIED);
+			source.Reply(_(ACCESS_DENIED));
 			return MOD_CONT;
 		}
 
 		if (bi->HasFlag(BI_PRIVATE) && !u->Account()->HasCommand("botserv/assign/private"))
 		{
-			source.Reply(LanguageString::ACCESS_DENIED);
+			source.Reply(_(ACCESS_DENIED));
 			return MOD_CONT;
 		}
 
diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp
index dd87ba41d..191ef958d 100644
--- a/modules/core/bs_badwords.cpp
+++ b/modules/core/bs_badwords.cpp
@@ -246,7 +246,7 @@ class CommandBSBadwords : public Command
 
 		if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->Account()->HasPriv("botserv/administration")))
 		{
-			source.Reply(LanguageString::ACCESS_DENIED);
+			source.Reply(_(ACCESS_DENIED));
 			return MOD_CONT;
 		}
 
diff --git a/modules/core/bs_bot.cpp b/modules/core/bs_bot.cpp
index 60dc5afaa..0c0c0730d 100644
--- a/modules/core/bs_bot.cpp
+++ b/modules/core/bs_bot.cpp
@@ -89,7 +89,7 @@ class CommandBSBot : public Command
 		*/
 		if (findnick(nick))
 		{
-			source.Reply(LanguageString::NICK_ALREADY_REGISTERED, nick.c_str());
+			source.Reply(_(NICK_ALREADY_REGISTERED), nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -125,13 +125,13 @@ class CommandBSBot : public Command
 
 		if (!(bi = findbot(oldnick)))
 		{
-			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, oldnick.c_str());
+			source.Reply(_(BOT_DOES_NOT_EXIST), oldnick.c_str());
 			return MOD_CONT;
 		}
 
 		if (!oldnick.equals_ci(nick) && nickIsServices(oldnick, false))
 		{
-			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, oldnick.c_str());
+			source.Reply(_(BOT_DOES_NOT_EXIST), oldnick.c_str());
 			return MOD_CONT;
 		}
 
@@ -155,7 +155,7 @@ class CommandBSBot : public Command
 
 		if (!oldnick.equals_ci(nick) && nickIsServices(nick, false))
 		{
-			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, oldnick.c_str());
+			source.Reply(_(BOT_DOES_NOT_EXIST), oldnick.c_str());
 			return MOD_CONT;
 		}
 
@@ -219,7 +219,7 @@ class CommandBSBot : public Command
 			*/
 			if (findnick(nick))
 			{
-				source.Reply(LanguageString::NICK_ALREADY_REGISTERED, nick.c_str());
+				source.Reply(_(NICK_ALREADY_REGISTERED), nick.c_str());
 				return MOD_CONT;
 			}
 
@@ -282,13 +282,13 @@ class CommandBSBot : public Command
 
 		if (!(bi = findbot(nick)))
 		{
-			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, nick.c_str());
+			source.Reply(_(BOT_DOES_NOT_EXIST), nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nickIsServices(nick, false))
 		{
-			source.Reply(LanguageString::BOT_DOES_NOT_EXIST, nick.c_str());
+			source.Reply(_(BOT_DOES_NOT_EXIST), nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -323,7 +323,7 @@ class CommandBSBot : public Command
 			// ADD nick user host real - 5
 			if (!u->Account()->HasCommand("botserv/bot/add"))
 			{
-				source.Reply(LanguageString::ACCESS_DENIED);
+				source.Reply(_(ACCESS_DENIED));
 				return MOD_CONT;
 			}
 
@@ -346,7 +346,7 @@ class CommandBSBot : public Command
 			// but only oldn and newn are required
 			if (!u->Account()->HasCommand("botserv/bot/change"))
 			{
-				source.Reply(LanguageString::ACCESS_DENIED);
+				source.Reply(_(ACCESS_DENIED));
 				return MOD_CONT;
 			}
 
@@ -363,7 +363,7 @@ class CommandBSBot : public Command
 			// DEL nick
 			if (!u->Account()->HasCommand("botserv/bot/del"))
 			{
-				source.Reply(LanguageString::ACCESS_DENIED);
+				source.Reply(_(ACCESS_DENIED));
 				return MOD_CONT;
 			}
 
diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp
index 48f09bc19..cb10631cb 100644
--- a/modules/core/bs_info.cpp
+++ b/modules/core/bs_info.cpp
@@ -72,11 +72,11 @@ class CommandBSInfo : public Command
 		{
 			if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("botserv/administration"))
 			{
-				source.Reply(LanguageString::ACCESS_DENIED);
+				source.Reply(_(ACCESS_DENIED));
 				return MOD_CONT;
 			}
 
-			source.Reply(LanguageString::CHAN_INFO_HEADER, ci->name.c_str());
+			source.Reply(_(CHAN_INFO_HEADER), ci->name.c_str());
 			if (ci->bi)
 				source.Reply(_("           Bot nick : %s"), ci->bi->nick.c_str());
 			else
@@ -85,93 +85,93 @@ class CommandBSInfo : public Command
 			if (ci->botflags.HasFlag(BS_KICK_BADWORDS))
 			{
 				if (ci->ttb[TTB_BADWORDS])
-					source.Reply(_("   Bad words kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_BADWORDS]);
+					source.Reply(_("   Bad words kicker : %s (%d kick(s) to ban)"), _(ENABLED), ci->ttb[TTB_BADWORDS]);
 				else
-					source.Reply(_("   Bad words kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
+					source.Reply(_("   Bad words kicker : %s"), _(ENABLED));
 			}
 			else
-				source.Reply(_("   Bad words kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
+				source.Reply(_("   Bad words kicker : %s"), _(DISABLED));
 			if (ci->botflags.HasFlag(BS_KICK_BOLDS))
 			{
 				if (ci->ttb[TTB_BOLDS])
-					source.Reply(_("       Bolds kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_BOLDS]);
+					source.Reply(_("       Bolds kicker : %s (%d kick(s) to ban)"), _(ENABLED), ci->ttb[TTB_BOLDS]);
 				else
-					source.Reply(_("       Bolds kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
+					source.Reply(_("       Bolds kicker : %s"), _(ENABLED));
 			}
 			else
-				source.Reply(_("       Bolds kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
+				source.Reply(_("       Bolds kicker : %s"), _(DISABLED));
 			if (ci->botflags.HasFlag(BS_KICK_CAPS))
 			{
 				if (ci->ttb[TTB_CAPS])
-					source.Reply(_("        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent);
+					source.Reply(_("        Caps kicker : %s (%d kick(s) to ban; minimum %d/%d%%)"), _(ENABLED), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent);
 				else
-					source.Reply(_("        Caps kicker : %s (minimum %d/%d%%)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->capsmin, ci->capspercent);
+					source.Reply(_("        Caps kicker : %s (minimum %d/%d%%)"), _(ENABLED), ci->capsmin, ci->capspercent);
 			}
 			else
-				source.Reply(_("        Caps kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
+				source.Reply(_("        Caps kicker : %s"), _(DISABLED));
 			if (ci->botflags.HasFlag(BS_KICK_COLORS))
 			{
 				if (ci->ttb[TTB_COLORS])
-					source.Reply(_("      Colors kicker : %s (%d kick(s) to ban)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_COLORS]);
+					source.Reply(_("      Colors kicker : %s (%d kick(s) to ban)"), _(ENABLED), ci->ttb[TTB_COLORS]);
 				else
-					source.Reply(_("      Colors kicker : %s"), GetString(u->Account(), LanguageString::ENABLED).c_str());
+					source.Reply(_("      Colors kicker : %s"), _(ENABLED));
 			}
 			else
-				source.Reply(_("      Colors kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
+				source.Reply(_("      Colors kicker : %s"), _(DISABLED));
 			if (ci->botflags.HasFlag(BS_KICK_FLOOD))
 			{
 				if (ci->ttb[TTB_FLOOD])
-					source.Reply(_("       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs);
+					source.Reply(_("       Flood kicker : %s (%d kick(s) to ban; %d lines in %ds)"), _(ENABLED), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs);
 				else
-					source.Reply(_("       Flood kicker : %s (%d lines in %ds)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->floodlines, ci->floodsecs);
+					source.Reply(_("       Flood kicker : %s (%d lines in %ds)"), _(ENABLED), ci->floodlines, ci->floodsecs);
 			}
 			else
-				source.Reply(_("       Flood kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
+				source.Reply(_("       Flood kicker : %s"), _(DISABLED));
 			if (ci->botflags.HasFlag(BS_KICK_REPEAT))
 			{
 				if (ci->ttb[TTB_REPEAT])
-					source.Reply(_("      Repeat kicker : %s (%d kick(s) to ban; %d times)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->ttb[TTB_REPEAT], ci->repeattimes);
+					source.Reply(_("      Repeat kicker : %s (%d kick(s) to ban; %d times)"), _(ENABLED), ci->ttb[TTB_REPEAT], ci->repeattimes);
 				else
-					source.Reply(_("      Repeat kicker : %s (%d times)"), GetString(u->Account(), LanguageString::ENABLED).c_str(), ci->repeattimes);
+					source.Reply(_("      Repeat kicker : %s (%d times)"), _(ENABLED), ci->repeattimes);
 			}
 			else
-				source.Reply(_("      Repeat kicker : %s"), GetString(u->Account(), LanguageString::DISABLED).c_str());
+				source.Reply(_("      Repeat