Fixed bug #1258, more Windows stuff, and more language strings

15 files changed, 20 insertions, 20 deletions

diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp
index b5de45cb7..3e868c25a 100644
--- a/modules/core/bs_act.cpp
+++ b/modules/core/bs_act.cpp
@@ -35,7 +35,7 @@ class CommandBSAct : public Command
 
 		if (!ci->bi)
 		{
-			source.Reply(_(BOT_NOT_ASSIGNED));
+			source.Reply(_(BOT_NOT_ASSIGNED), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
 			return MOD_CONT;
 		}
 
diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp
index 82882b480..ef78511a7 100644
--- a/modules/core/bs_kick.cpp
+++ b/modules/core/bs_kick.cpp
@@ -41,7 +41,7 @@ class CommandBSKick : public Command
 		else if (!check_access(u, ci, CA_SET) && !u->HasPriv("botserv/administration"))
 			source.Reply(_(ACCESS_DENIED));
 		else if (!ci->bi)
-			source.Reply(_(BOT_NOT_ASSIGNED));
+			source.Reply(_(BOT_NOT_ASSIGNED), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
 		else
 		{
 			bool override = !check_access(u, ci, CA_SET);
@@ -451,7 +451,7 @@ class CommandBSKick : public Command
 				}
 			}
 			else
-				source.Reply(_(UNKNOWN_OPTION), option.c_str(), this->name.c_str());
+				source.Reply(_(UNKNOWN_OPTION), Config->UseStrictPrivMsgString.c_str(), option.c_str(), this->name.c_str());
 		}
 		return MOD_CONT;
 	}
diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp
index 2f6c3b4ed..d64880964 100644
--- a/modules/core/bs_say.cpp
+++ b/modules/core/bs_say.cpp
@@ -36,7 +36,7 @@ class CommandBSSay : public Command
 
 		if (!ci->bi)
 		{
-			source.Reply(_(BOT_NOT_ASSIGNED));
+			source.Reply(_(BOT_NOT_ASSIGNED), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
 			return MOD_CONT;
 		}
 
diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp
index 496190f75..3b635131a 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/core/bs_set.cpp
@@ -192,7 +192,7 @@ class CommandBSSet : public Command
 					SyntaxError(source, "SET MSG", _("SET \037channel\037 MSG {\037OFF|PRIVMSG|NOTICE|\037}"));
 			}
 			else
-				source.Reply(_(UNKNOWN_OPTION), option.c_str(), this->name.c_str());
+				source.Reply(_(UNKNOWN_OPTION), Config->UseStrictPrivMsgString.c_str(), option.c_str(), this->name.c_str());
 		}
 
 		return MOD_CONT;
diff --git a/modules/core/bs_unassign.cpp b/modules/core/bs_unassign.cpp
index f64cb526d..8e28508ab 100644
--- a/modules/core/bs_unassign.cpp
+++ b/modules/core/bs_unassign.cpp
@@ -33,7 +33,7 @@ class CommandBSUnassign : public Command
 		else if (!u->HasPriv("botserv/administration") && !check_access(u, ci, CA_ASSIGN))
 			source.Reply(_(ACCESS_DENIED));
 		else if (!ci->bi)
-			source.Reply(_(BOT_NOT_ASSIGNED));
+			source.Reply(_(BOT_NOT_ASSIGNED), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str());
 		else if (ci->HasFlag(CI_PERSIST) && !cm)
 			source.Reply(_("You can not unassign bots while persist is set on the channel."));
 		else
diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp
index 77adbe815..ca156242b 100644
--- a/modules/core/cs_saset.cpp
+++ b/modules/core/cs_saset.cpp
@@ -60,7 +60,7 @@ class CommandCSSASet : public Command
 		else
 		{
 			source.Reply(_("Unknown SASET option \002%s\002."), params[1].c_str());
-			source.Reply(_(MORE_INFO), Config->s_ChanServ.c_str(), "SET");
+			source.Reply(_(MORE_INFO), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str(), "SET");
 		}
 
 		return MOD_CONT;
diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp
index be6147b58..7923070db 100644
--- a/modules/core/cs_set.cpp
+++ b/modules/core/cs_set.cpp
@@ -63,8 +63,8 @@ class CommandCSSet : public Command
 		}
 		else
 		{
-			source.Reply(_(NICK_SET_UNKNOWN_OPTION), params[1].c_str());
-			source.Reply(_(MORE_INFO), Config->s_ChanServ.c_str(), "SET");
+			source.Reply(_(NICK_SET_UNKNOWN_OPTION), Config->UseStrictPrivMsgString.c_str(), params[1].c_str());
+			source.Reply(_(MORE_INFO), Config->UseStrictPrivMsgString.c_str(), Config->s_ChanServ.c_str(), "SET");
 		}
 
 		return MOD_CONT;
diff --git a/modules/core/ms_set.cpp b/modules/core/ms_set.cpp
index a03d6ee03..35e5c6db5 100644
--- a/modules/core/ms_set.cpp
+++ b/modules/core/ms_set.cpp
@@ -218,8 +218,8 @@ class CommandMSSet : public Command
 			return this->DoLimit(source, params, mi);
 		else
 		{
-			source.Reply(_(NICK_SET_UNKNOWN_OPTION), cmd.c_str());
-			source.Reply(_(MORE_INFO), Config->s_MemoServ.c_str(), "SET");
+			source.Reply(_(NICK_SET_UNKNOWN_OPTION), Config->UseStrictPrivMsgString.c_str(), cmd.c_str());
+			source.Reply(_(MORE_INFO), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), "SET");
 		}
 
 		return MOD_CONT;
diff --git a/modules/core/ns_access.cpp b/modules/core/ns_access.cpp
index c3c46297c..45265a6fd 100644
--- a/modules/core/ns_access.cpp
+++ b/modules/core/ns_access.cpp
@@ -133,7 +133,7 @@ class CommandNSAccess : public Command
 		if (!mask.empty() && mask.find('@') == Anope::string::npos)
 		{
 			source.Reply(_(BAD_USERHOST_MASK));
-			source.Reply(_(MORE_INFO), Config->s_NickServ.c_str(), "ACCESS");
+			source.Reply(_(MORE_INFO), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), "ACCESS");
 		}
 		else if (u->Account()->HasFlag(NI_SUSPENDED))
 			source.Reply(_(NICK_X_SUSPENDED), u->Account()->display.c_str());
diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp
index 7127f018d..75a0b7899 100644
--- a/modules/core/ns_drop.cpp
+++ b/modules/core/ns_drop.cpp
@@ -42,7 +42,7 @@ class CommandNSDrop : public Command
 
 		if (!u->Account())
 		{
-			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
+			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 			return MOD_CONT;
 		}
 
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp
index e4e5fae88..4b0fda4c4 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/core/ns_group.cpp
@@ -73,7 +73,7 @@ class CommandNSGroup : public Command
 		else if (na && target->nc == na->nc)
 			source.Reply(_("You are already a member of the group of \002%s\002."), target->nick.c_str());
 		else if (na && na->nc != u->Account())
-			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
+			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 		else if (na && Config->NSNoGroupChange)
 			source.Reply(_("Your nick is already registered; type \002%s%s DROP\002 first."), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 		else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp
index 936e2b51a..416b0e184 100644
--- a/modules/core/ns_recover.cpp
+++ b/modules/core/ns_recover.cpp
@@ -53,7 +53,7 @@ class CommandNSRecover : public Command
 				/* Convert Config->NSReleaseTimeout seconds to string format */
 				Anope::string relstr = duration(Config->NSReleaseTimeout);
 
-				source.Reply(_(NICK_RECOVERED), Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
+				source.Reply(_(NICK_RECOVERED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
 			}
 			else
 			{
@@ -77,7 +77,7 @@ class CommandNSRecover : public Command
 				/* Convert Config->NSReleaseTimeout seconds to string format */
 				Anope::string relstr = duration(Config->NSReleaseTimeout);
 
-				source.Reply(_(NICK_RECOVERED), Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
+				source.Reply(_(NICK_RECOVERED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
 			}
 			else
 				source.Reply(_(ACCESS_DENIED));
diff --git a/modules/core/ns_release.cpp b/modules/core/ns_release.cpp
index ff0424577..94a778218 100644
--- a/modules/core/ns_release.cpp
+++ b/modules/core/ns_release.cpp
@@ -87,7 +87,7 @@ class CommandNSRelease : public Command
 				"current address as shown in /WHOIS must be on that nick's\n"
 				"access list, you must be identified and in the group of\n"
 				"that nick, or you must supply the correct password for\n"
-				"the nickname."), NickServ->nick.c_str());
+				"the nickname."), NickServ->nick.c_str(), relstr.c_str());
 
 
 		return true;
diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp
index 8dc750f8b..626af80c8 100644
--- a/modules/core/ns_resetpass.cpp
+++ b/modules/core/ns_resetpass.cpp
@@ -137,7 +137,7 @@ static bool SendResetEmail(User *u, NickAlias *na)
 	for (idx = 0; idx < 20; ++idx)
 		passcode += chars[1 + static_cast<int>((static_cast<float>(max - min)) * getrandom16() / 65536.0) + min];
 
-	Anope::string subject = Anope::printf(GetString(na->nc, "Reset password request for %s"), na->nick.c_str());
+	Anope::string subject = Anope::printf(GetString(na->nc, "Reset password request for %s").c_str(), na->nick.c_str());
 	Anope::string message = Anope::printf(GetString(na->nc,
 	"Hi,\n"
 	" \n"
@@ -146,7 +146,7 @@ static bool SendResetEmail(User *u, NickAlias *na)
 	" \n"
 	"If you don't know why this mail was sent to you, please ignore it silently.\n"
 	" \n"
-	"%s administrators."), na->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), na->nick.c_str(), passcode.c_str(), Config->NetworkName.c_str());
+	"%s administrators.").c_str(), na->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str(), na->nick.c_str(), passcode.c_str(), Config->NetworkName.c_str());
 
 	na->nc->Extend("ns_resetpass_code", new ExtensibleItemRegular<Anope::string>(passcode));
 	na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular<time_t>(Anope::CurTime));
diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp
index 103cff38c..bfae7f508 100644
--- a/modules/core/ns_set.cpp
+++ b/modules/core/ns_set.cpp
@@ -60,7 +60,7 @@ class CommandNSSet : public Command
 			mod_run_cmd(NickServ, u, NULL, c, params[0], cmdparams);
 		}
 		else
-			source.Reply(_(NICK_SET_UNKNOWN_OPTION), params[0].c_str());
+			source.Reply(_(NICK_SET_UNKNOWN_OPTION), Config->UseStrictPrivMsgString.c_str(), params[0].c_str());
 
 		return MOD_CONT;
 	}