Consistently use email instead of e-mail.

3 files changed, 15 insertions, 15 deletions

diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp
index 058dd29be..cb5e41ff6 100644
--- a/modules/nickserv/nickserv.cpp
+++ b/modules/nickserv/nickserv.cpp
@@ -359,11 +359,11 @@ public:
 
 		if (u->Account()->email.empty())
 		{
-			u->SendMessage(NickServ, _("You must now supply an e-mail for your nick.\n"
-							"This e-mail will allow you to retrieve your password in\n"
+			u->SendMessage(NickServ, _("You must now supply an email for your nick.\n"
+							"This email will allow you to retrieve your password in\n"
 							"case you forget it."));
-			u->SendMessage(NickServ, _("Type \002%s%s SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n"
-							"Your privacy is respected; this e-mail won't be given to\n"
+			u->SendMessage(NickServ, _("Type \002%s%s SET EMAIL \037email\037\002 in order to set your email.\n"
+							"Your privacy is respected; this email won't be given to\n"
 							"any third-party person."), Config->StrictPrivmsg.c_str(), NickServ->nick.c_str());
 		}
 
@@ -541,7 +541,7 @@ public:
 
 			if (expire)
 			{
-				Log(LOG_NORMAL, "nickserv/expire", NickServ) << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (e-mail: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")";
+				Log(LOG_NORMAL, "nickserv/expire", NickServ) << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (email: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")";
 				FOREACH_MOD(OnNickExpire, (na));
 				delete na;
 			}
diff --git a/modules/nickserv/ns_info.cpp b/modules/nickserv/ns_info.cpp
index 09769345c..469a0c1f3 100644
--- a/modules/nickserv/ns_info.cpp
+++ b/modules/nickserv/ns_info.cpp
@@ -166,8 +166,8 @@ public:
 		if (param.equals_ci("EMAIL"))
 		{
 			flag = "HIDE_EMAIL";
-			onmsg = _("The E-mail address of \002%s\002 will now be hidden from %s INFO displays.");
-			offmsg = _("The E-mail address of \002%s\002 will now be shown in %s INFO displays.");
+			onmsg = _("The email address of \002%s\002 will now be hidden from %s INFO displays.");
+			offmsg = _("The email address of \002%s\002 will now be shown in %s INFO displays.");
 		}
 		else if (param.equals_ci("USERMASK"))
 		{
@@ -220,7 +220,7 @@ public:
 		source.Reply(" ");
 		source.Reply(_("Allows you to prevent certain pieces of information from\n"
 				"being displayed when someone does a %s \002INFO\002 on your\n"
-				"nick.  You can hide your E-mail address (\002EMAIL\002), last seen\n"
+				"nick.  You can hide your email address (\002EMAIL\002), last seen\n"
 				"user@host mask (\002USERMASK\002), your services access status\n"
 				"(\002STATUS\002) and last quit message (\002QUIT\002).\n"
 				"The second parameter specifies whether the information should\n"
@@ -250,7 +250,7 @@ public:
 		source.Reply(" ");
 		source.Reply(_("Allows you to prevent certain pieces of information from\n"
 				"being displayed when someone does a %s \002INFO\002 on the\n"
-				"nick.  You can hide the E-mail address (\002EMAIL\002), last seen\n"
+				"nick.  You can hide the email address (\002EMAIL\002), last seen\n"
 				"user@host mask (\002USERMASK\002), the services access status\n"
 				"(\002STATUS\002) and last quit message (\002QUIT\002).\n"
 				"The second parameter specifies whether the information should\n"
diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp
index b02c6e6ba..d38c62051 100644
--- a/modules/nickserv/ns_set.cpp
+++ b/modules/nickserv/ns_set.cpp
@@ -544,7 +544,7 @@ class CommandNSSetEmail
 public:
 	CommandNSSetEmail(Module *creator, const Anope::string &cname = "nickserv/set/email", size_t min = 1) : Command(creator, cname, min, min + 1)
 	{
-		this->SetDesc(_("Associate an E-mail address with your nickname"));
+		this->SetDesc(_("Associate an email address with your nickname"));
 		this->SetSyntax(_("\037address\037"));
 	}
 
@@ -572,7 +572,7 @@ public:
 
 		else if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
 		{
-			source.Reply(_("You may not change the e-mail of other Services Operators."));
+			source.Reply(_("You may not change the email of other Services Operators."));
 			return;
 		}
 		else if (!Mail::Validate(param))
@@ -591,14 +591,14 @@ public:
 			if (SendConfirmMail(source.GetUser(), source.GetAccount(), source.service, param))
 			{
 				Log(LOG_COMMAND, source, this) << "to request changing the email of " << nc->display << " to " << param;
-				source.Reply(_("A confirmation e-mail has been sent to \002%s\002. Follow the instructions in it to change your e-mail address."), param.c_str());
+				source.Reply(_("A confirmation email has been sent to \002%s\002. Follow the instructions in it to change your email address."), param.c_str());
 			}
 		}
 		else
 		{
 			Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the email of " << nc->display << " to " << param;
 			nc->email = param;
-			source.Reply(_("E-mail address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
+			source.Reply(_("Email address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
 		}
 	}
 
@@ -611,7 +611,7 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Associates the given E-mail address with your nickname.\n"
+		source.Reply(_("Associates the given email address with your nickname.\n"
 				"This address will be displayed whenever someone requests\n"
 				"information on the nickname with the \002INFO\002 command."));
 		return true;
@@ -637,7 +637,7 @@ public:
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("Associates the given E-mail address with the nickname."));
+		source.Reply(_("Associates the given email address with the nickname."));
 		return true;
 	}
 };